From fe913a078204786534c2170dbfa1800100a70a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Wed, 18 Mar 2020 20:07:49 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@839 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/QADDeploy.cmake | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/qad/QADDeploy.cmake b/qad/QADDeploy.cmake index 58fa627..cc20cf8 100644 --- a/qad/QADDeploy.cmake +++ b/qad/QADDeploy.cmake @@ -197,6 +197,7 @@ macro(deploy_target _T) elseif("_${MY_ARCH}" STREQUAL "_ia64") set(_DEB_ARCH "ia64") endif() + set(_echof ">" "${_AGD}/DEBIAN/control") set(_echo ">>" "${_AGD}/DEBIAN/control") add_custom_target(deploy # gather deb dir @@ -211,15 +212,15 @@ macro(deploy_target _T) COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/usr/share/SHS COMMAND cp -f ${_ICON_FN} ${_AGD}/usr/share/pixmaps COMMAND rm ${_AGD}/DEBIAN/control - COMMAND echo "\"Package: ${_T}\"" - COMMAND echo "\"Version: ${${_T}_VERSION}\"" - COMMAND echo "\"Architecture: ${_DEB_ARCH}\"" - COMMAND echo "\"Maintainer: ${${_T}_COMPANY} <>\"" - COMMAND echo "\"Depends: openjdk-8-jre, icedtea-netx-common (>= 1.6.2-3.1+deb9u1)\"" - COMMAND echo "\"Conflicts:\"" - COMMAND echo "\"Replaces:\"" - COMMAND echo "\"Section: misc\"" - COMMAND echo "\"Priority: optional\"" + COMMAND echo "\"Package: ${_T}\"" ${_echof} + COMMAND echo "\"Version: ${${_T}_VERSION}\"" ${_echo} + COMMAND echo "\"Architecture: ${_DEB_ARCH}\"" ${_echo} + COMMAND echo "\"Maintainer: ${${_T}_COMPANY} <>\"" ${_echo} + COMMAND echo "\"Depends: openjdk-8-jre, icedtea-netx-common (>= 1.6.2-3.1+deb9u1)\"" ${_echo} + COMMAND echo "\"Conflicts:\"" ${_echo} + COMMAND echo "\"Replaces:\"" ${_echo} + COMMAND echo "\"Section: misc\"" ${_echo} + COMMAND echo "\"Priority: optional\"" ${_echo} COMMAND echo "\"Description: ${${_T}_INFO}\"" #COMMAND deploy_tool -l "${CMAKE_LDD}" -P xcb -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib;${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD}/usr/lib -p ${_AGD}/usr/ ${_AGD}/Contents/MacOS/${_T} # generate deb