Skip to content
Snippets Groups Projects
Commit 337b2073 authored by Nikolay Panko's avatar Nikolay Panko Committed by Dmitry Puzyrkov
Browse files

Fix 15644

parent e729633a
No related branches found
No related tags found
No related merge requests found
...@@ -113,6 +113,18 @@ fi ...@@ -113,6 +113,18 @@ fi
. ${HERE}/targets/${BUILD_TARGET}.sh . ${HERE}/targets/${BUILD_TARGET}.sh
# Add -DBUILD_DIAGTOOL=ON if the target is windows
if [ "$BUILD_TARGET" == "windows" ]; then
BUILD_OPTIONS[${#BUILD_OPTIONS[@]}]="-DBUILD_DIAGTOOL=ON"
fi
# Add -DBUILD_DIAGTOOL=ON the target is linux
if [ "$BUILD_TARGET" == "linux" ]; then
BUILD_OPTIONS[${#BUILD_OPTIONS[@]}]="-DBUILD_DIAGTOOL=ON"
fi
# Add -DBUILD_DIAGTOOL=ON the target is osx
if [ "$BUILD_TARGET" == "osx" ]; then
BUILD_OPTIONS[${#BUILD_OPTIONS[@]}]="-DBUILD_DIAGTOOL=ON"
fi
#all base logic from here #all base logic from here
mkdir -p ${BUILD_DIR}/build mkdir -p ${BUILD_DIR}/build
mkdir -p ${BUILD_DIR}/dist mkdir -p ${BUILD_DIR}/dist
...@@ -136,4 +148,4 @@ echo "${CMAKE[@]} ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}" ...@@ -136,4 +148,4 @@ echo "${CMAKE[@]} ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}"
export INSTALL_ROOT=${BUILD_DIR}/dist export INSTALL_ROOT=${BUILD_DIR}/dist
"${CMAKE[@]}" ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]} "${CMAKE[@]}" ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}
"${MAKE[@]}" -j $NPROC "${MAKE[@]}" -j $NPROC
"${MAKE[@]}" install DESTDIR=${INSTALL_ROOT} "${MAKE[@]}" install DESTDIR=${INSTALL_ROOT}
\ No newline at end of file
...@@ -114,6 +114,9 @@ PACK_LINUX() ...@@ -114,6 +114,9 @@ PACK_LINUX()
rcodesign sign --code-signature-flags runtime \ rcodesign sign --code-signature-flags runtime \
--p12-file ${OSX_PKEY_INSTALLER} --p12-password ${OSX_PKEY_INSTALLER_PASS} \ --p12-file ${OSX_PKEY_INSTALLER} --p12-password ${OSX_PKEY_INSTALLER_PASS} \
${PAYLOAD_BUILD}/CellframeNode.app/Contents/MacOS/cellframe-node-config ${PAYLOAD_BUILD}/CellframeNode.app/Contents/MacOS/cellframe-node-config
rcodesign sign --code-signature-flags runtime \
--p12-file ${OSX_PKEY_INSTALLER} --p12-password ${OSX_PKEY_INSTALLER_PASS} \
${PAYLOAD_BUILD}/CellframeNode.app/Contents/MacOS/cellframe-diagtool
fi fi
cp ${PACKAGE_DIR}/preinstall ${SCRIPTS_BUILD} cp ${PACKAGE_DIR}/preinstall ${SCRIPTS_BUILD}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment