From 337b20731e687d349e6cdba1381457ba8bbec541 Mon Sep 17 00:00:00 2001
From: Nikolay Panko <nikolay.panko@demlabs.net>
Date: Mon, 17 Feb 2025 13:00:11 +0000
Subject: [PATCH] Fix 15644
---
build.sh | 14 +++++++++++++-
packaging/osx.sh | 3 +++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 7ce5a56..f9b9418 100755
--- a/build.sh
+++ b/build.sh
@@ -113,6 +113,18 @@ fi
. ${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
mkdir -p ${BUILD_DIR}/build
mkdir -p ${BUILD_DIR}/dist
@@ -136,4 +148,4 @@ echo "${CMAKE[@]} ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}"
export INSTALL_ROOT=${BUILD_DIR}/dist
"${CMAKE[@]}" ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}
"${MAKE[@]}" -j $NPROC
-"${MAKE[@]}" install DESTDIR=${INSTALL_ROOT}
+"${MAKE[@]}" install DESTDIR=${INSTALL_ROOT}
\ No newline at end of file
diff --git a/packaging/osx.sh b/packaging/osx.sh
index 7be67b6..7fb5e59 100644
--- a/packaging/osx.sh
+++ b/packaging/osx.sh
@@ -114,6 +114,9 @@ PACK_LINUX()
rcodesign sign --code-signature-flags runtime \
--p12-file ${OSX_PKEY_INSTALLER} --p12-password ${OSX_PKEY_INSTALLER_PASS} \
${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
cp ${PACKAGE_DIR}/preinstall ${SCRIPTS_BUILD}
--
GitLab