From dc8ec9093b0851bd23a0ce8f2e388811aa4e6d61 Mon Sep 17 00:00:00 2001
From: dpuzyrkov <dpuzyrkov@gmail.com>
Date: Thu, 10 Nov 2022 16:39:21 +0300
Subject: [PATCH] [*] some build improvements
---
build.sh | 7 ++++---
oldscripts/linux/debian/essentials/config | 9 +++++++++
targets/windows.sh | 7 ++++---
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index 2aba1f9..877f3da 100755
--- a/build.sh
+++ b/build.sh
@@ -74,6 +74,7 @@ cd ${BUILD_DIR}/build
#debug out
echo "$CMAKE ${BUILD_OPTIONS[@]}"
-
-"${CMAKE[@]}" ../../ ${BUILD_OPTIONS[@]}
-"${MAKE[@]}"
+export INSTALL_ROOT=${BUILD_DIR}/dist
+"${CMAKE[@]}" ${HERE}/../ ${BUILD_OPTIONS[@]}
+"${MAKE[@]}" -j$(nproc)
+"${MAKE[@]}" install DESTDIR=${INSTALL_ROOT}
diff --git a/oldscripts/linux/debian/essentials/config b/oldscripts/linux/debian/essentials/config
index 47ad739..ae86fd7 100755
--- a/oldscripts/linux/debian/essentials/config
+++ b/oldscripts/linux/debian/essentials/config
@@ -53,6 +53,15 @@ reconfigure|configure)
db_go || true
fi
+ db_input critical cellframe-node/mileena_enabled || true
+ db_go || true
+
+ db_get cellframe-node/mileena_enabled
+ if [ "$RET" = "true" ]; then
+ db_input critical cellframe-node/mileena_node_type || true
+ db_go || true
+ fi
+
db_input critical cellframe-node/enable_python_plugins || true
db_go || true
diff --git a/targets/windows.sh b/targets/windows.sh
index 73746dd..2bd3129 100644
--- a/targets/windows.sh
+++ b/targets/windows.sh
@@ -20,12 +20,13 @@ then
exit 255
fi
-#qmake command
-CMAKE=(${MXE_ROOT}/usr/bin/x86_64-w64-mingw32.static-cmake)
+#cmake command
+#mxe install prefix if configured by mxe, need to change it
+CMAKE=(${MXE_ROOT}/usr/bin/x86_64-w64-mingw32.static-cmake )
export PATH=${MXE_ROOT}/usr/bin:$PATH
#everything else can be done by default make
MAKE=(make)
echo "Windows target"
echo "CMAKE=${CMAKE[@]}"
-echo "MAKE=${MAKE[@]}"
\ No newline at end of file
+echo "MAKE=${MAKE[@]}"
--
GitLab