Merge pull request #319 from eclipse-threadx/dev

fdesbiens · web-flow · commit 5af33d7d55e6 · 2025-05-16T14:28:03.000+02:00
Fixes to build script and submodule definitions
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,9 @@
 	path = addons/azure_iot/azure-sdk-for-c
 	url = https://github.com/Azure/azure-sdk-for-c.git
 	branch = 1.0.0
+[submodule "test/cmake/filex"]
+	path = test/cmake/filex
+	url = https://github.com/eclipse-threadx/filex.git
+[submodule "test/cmake/threadx"]
+	path = test/cmake/threadx
+	url = https://github.com/eclipse-threadx/threadx.git
diff --git a/scripts/build_azure_iot.sh b/scripts/build_azure_iot.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/azure_iot/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/azure_iot/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_crypto.sh b/scripts/build_crypto.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/crypto/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/crypto/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_mqtt.sh b/scripts/build_mqtt.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/mqtt/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/mqtt/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_mqtt_interoperability.sh b/scripts/build_mqtt_interoperability.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/mqtt_interoperability/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/mqtt_interoperability/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_nxd.sh b/scripts/build_nxd.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/netxduo/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_nxd64.sh b/scripts/build_nxd64.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/netxduo64/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo64/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_nxd_fast.sh b/scripts/build_nxd_fast.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/netxduo_fast/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo_fast/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_ptp.sh b/scripts/build_ptp.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/ptp/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/ptp/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_secure.sh b/scripts/build_secure.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/nx_secure/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/nx_secure/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_secure_interoperability.sh b/scripts/build_secure_interoperability.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/nx_secure_interoperability/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/nx_secure_interoperability/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/build_web.sh b/scripts/build_web.sh
@@ -1,3 +1,6 @@
 #! /bin/bash
 
-$(dirname `realpath $0`)/../test/cmake/web/run.sh build all
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/web/run.sh"
+
+. ./func_build.sh
diff --git a/scripts/func_build.sh b/scripts/func_build.sh
@@ -0,0 +1,15 @@
+#! /bin/bash
+
+"$RUN_SCRIPT" build all
+
+# Common error condition is that a user clones the netxduo repo without --recursive option.
+# This results in a 127 error code (run.sh file not found).
+# Try to fix this under-the-hood and attempt the script again.
+status=$?
+if [[ $status -eq 127 ]]; then
+	# Get the submodules (not fetched if --recursive option was missed during clone)
+	(cd "$SCRIPT_DIR/.." && git submodule update --init --recursive)
+	# Try again to invoke the script
+	"$RUN_SCRIPT" build all
+fi
+
diff --git a/test/cmake/azure_iot/run.sh b/test/cmake/azure_iot/run.sh
@@ -48,8 +48,6 @@ function test() {
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
 
 result=$(sed -n "/(BUILD_CONFIGURATIONS/,/)/p" CMakeLists.txt|sed ':label;N;s/\n/ /;b label'|grep -Pzo "[a-zA-Z0-9_]*build[a-zA-Z0-9_]*\s*"| tr -d '\0')
 IFS=' '
diff --git a/test/cmake/crypto/run.sh b/test/cmake/crypto/run.sh
@@ -2,7 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
diff --git a/test/cmake/filex b/test/cmake/filex
@@ -1 +1 @@
-Subproject commit 1312f87f3b90c73c8db3aa1ccbadf15c60fe04bb
+Subproject commit 9023227ba4cf4e12d010daed121f5148b80403d9
diff --git a/test/cmake/mqtt/run.sh b/test/cmake/mqtt/run.sh
@@ -2,8 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
diff --git a/test/cmake/mqtt_interoperability/run.sh b/test/cmake/mqtt_interoperability/run.sh
@@ -2,8 +2,5 @@ eclipse-threadx#!/bin/bash
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 CTEST_PARALLEL_LEVEL=1 ENABLE_IDLE=ON ./.run.sh $*
diff --git a/test/cmake/netxduo/run.sh b/test/cmake/netxduo/run.sh
@@ -2,8 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
diff --git a/test/cmake/netxduo64/run.sh b/test/cmake/netxduo64/run.sh
@@ -2,8 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ENABLE_64=ON ./.run.sh $*
diff --git a/test/cmake/netxduo_fast/run.sh b/test/cmake/netxduo_fast/run.sh
@@ -2,8 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
diff --git a/test/cmake/nx_secure/run.sh b/test/cmake/nx_secure/run.sh
@@ -2,7 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
diff --git a/test/cmake/nx_secure_interoperability/run.sh b/test/cmake/nx_secure_interoperability/run.sh
@@ -2,7 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
diff --git a/test/cmake/ptp/run.sh b/test/cmake/ptp/run.sh
@@ -2,8 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 PTP_ONLY=ON ./.run.sh $*
diff --git a/test/cmake/threadx b/test/cmake/threadx
@@ -1 +1 @@
-Subproject commit 98c9172d01dcfdd0026ee3f5c6259dea6a12f253
+Subproject commit 7ad78c40e9702917264a9b722890110fdb909ebc
diff --git a/test/cmake/web/run.sh b/test/cmake/web/run.sh
@@ -2,8 +2,5 @@
 
 cd $(dirname $0)
 
-# if threadx repo does not exist, clone it
-[ -d ../threadx ] || git clone https://github.com/eclipse-threadx/threadx.git ../threadx --depth 1
-[ -d ../filex ] || git clone https://github.com/eclipse-threadx/filex.git ../filex --depth 1
 [ -f .run.sh ] || ln -sf ../threadx/scripts/cmake_bootstrap.sh .run.sh
 ./.run.sh $*
