From aba65143137c8b8d772752ed582c057674d2b0c3 Mon Sep 17 00:00:00 2001 From: Huan Nguyen Date: Wed, 14 May 2025 17:10:35 -0600 Subject: Remove submodules improperly added via clone --- test/cmake/filex | 1 - test/cmake/threadx | 1 - 2 files changed, 2 deletions(-) delete mode 160000 test/cmake/filex delete mode 160000 test/cmake/threadx diff --git a/test/cmake/filex b/test/cmake/filex deleted file mode 160000 index 1312f87f..00000000 --- a/test/cmake/filex +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1312f87f3b90c73c8db3aa1ccbadf15c60fe04bb diff --git a/test/cmake/threadx b/test/cmake/threadx deleted file mode 160000 index 98c9172d..00000000 --- a/test/cmake/threadx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 98c9172d01dcfdd0026ee3f5c6259dea6a12f253 -- cgit v1.3.1 From 7287ade62a51735b193bf3ec176be5db1fa23b4d Mon Sep 17 00:00:00 2001 From: Huan Nguyen Date: Wed, 14 May 2025 17:13:33 -0600 Subject: Add FileX and ThreadX as proper submodules --- .gitmodules | 6 ++++++ test/cmake/filex | 1 + test/cmake/threadx | 1 + 3 files changed, 8 insertions(+) create mode 160000 test/cmake/filex create mode 160000 test/cmake/threadx diff --git a/.gitmodules b/.gitmodules index 88c15b8f..22342415 100644 --- 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 = gh:eclipse-threadx/filex.git +[submodule "test/cmake/threadx"] + path = test/cmake/threadx + url = gh:eclipse-threadx/threadx.git diff --git a/test/cmake/filex b/test/cmake/filex new file mode 160000 index 00000000..1312f87f --- /dev/null +++ b/test/cmake/filex @@ -0,0 +1 @@ +Subproject commit 1312f87f3b90c73c8db3aa1ccbadf15c60fe04bb diff --git a/test/cmake/threadx b/test/cmake/threadx new file mode 160000 index 00000000..7ad78c40 --- /dev/null +++ b/test/cmake/threadx @@ -0,0 +1 @@ +Subproject commit 7ad78c40e9702917264a9b722890110fdb909ebc -- cgit v1.3.1 From ede5c3487ebd4cd5fbfa2309d80ceab92010d96c Mon Sep 17 00:00:00 2001 From: Huan Nguyen Date: Thu, 15 May 2025 08:31:33 -0600 Subject: Try to help user if build script fails A common error condition is that the user cloned the repo without the --recursive option. We'll try to get the submodules for them. We remove the git clone command because the submodule update should fix the issue. --- scripts/build_azure_iot.sh | 5 ++++- scripts/build_crypto.sh | 5 ++++- scripts/build_mqtt.sh | 5 ++++- scripts/build_mqtt_interoperability.sh | 5 ++++- scripts/build_nxd.sh | 5 ++++- scripts/build_nxd64.sh | 5 ++++- scripts/build_nxd_fast.sh | 5 ++++- scripts/build_ptp.sh | 5 ++++- scripts/build_secure.sh | 5 ++++- scripts/build_secure_interoperability.sh | 5 ++++- scripts/build_web.sh | 5 ++++- scripts/func_build.sh | 15 +++++++++++++++ test/cmake/azure_iot/run.sh | 2 -- test/cmake/crypto/run.sh | 2 -- test/cmake/mqtt/run.sh | 3 --- test/cmake/mqtt_interoperability/run.sh | 3 --- test/cmake/netxduo/run.sh | 3 --- test/cmake/netxduo64/run.sh | 3 --- test/cmake/netxduo_fast/run.sh | 3 --- test/cmake/nx_secure/run.sh | 2 -- test/cmake/nx_secure_interoperability/run.sh | 2 -- test/cmake/ptp/run.sh | 3 --- test/cmake/web/run.sh | 3 --- 23 files changed, 59 insertions(+), 40 deletions(-) create mode 100644 scripts/func_build.sh diff --git a/scripts/build_azure_iot.sh b/scripts/build_azure_iot.sh index 3b7bec71..dd8ef71a 100755 --- 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 \ No newline at end of file +SCRIPT_DIR=$(dirname "$(realpath "$0")") +RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/azure_iot/run.sh" + +. ./func_build.sh \ No newline at end of file diff --git a/scripts/build_crypto.sh b/scripts/build_crypto.sh index 451194ad..9e7329d5 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_mqtt.sh b/scripts/build_mqtt.sh index 25014531..885b4e4c 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_mqtt_interoperability.sh b/scripts/build_mqtt_interoperability.sh index 573c8e6d..a38c5d8c 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_nxd.sh b/scripts/build_nxd.sh index 2512fb67..deebfa80 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_nxd64.sh b/scripts/build_nxd64.sh index 93fc15c1..d0286ed1 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_nxd_fast.sh b/scripts/build_nxd_fast.sh index cf9ba54d..f8dd186a 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_ptp.sh b/scripts/build_ptp.sh index 6f715749..9471d592 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_secure.sh b/scripts/build_secure.sh index d1c77c02..a969ab19 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_secure_interoperability.sh b/scripts/build_secure_interoperability.sh index a1ada03b..d1c4f497 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_web.sh b/scripts/build_web.sh index a8bee025..fb1ad44b 100755 --- 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 \ No newline at end of file diff --git a/scripts/func_build.sh b/scripts/func_build.sh new file mode 100644 index 00000000..d6f0d9ce --- /dev/null +++ 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 index 266c4d13..76dac392 100755 --- 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 index 4ce326b4..67a9d258 100755 --- 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/mqtt/run.sh b/test/cmake/mqtt/run.sh index 84a4eb24..3bb37f7c 100755 --- 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 $* \ No newline at end of file diff --git a/test/cmake/mqtt_interoperability/run.sh b/test/cmake/mqtt_interoperability/run.sh index fa9d3829..827f8943 100755 --- 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 index 84a4eb24..3bb37f7c 100755 --- 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 $* \ No newline at end of file diff --git a/test/cmake/netxduo64/run.sh b/test/cmake/netxduo64/run.sh index ad59df07..36c1ad06 100755 --- 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 index 84a4eb24..3bb37f7c 100755 --- 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 $* \ No newline at end of file diff --git a/test/cmake/nx_secure/run.sh b/test/cmake/nx_secure/run.sh index 5635c6ff..3bb37f7c 100755 --- 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 $* \ No newline at end of file diff --git a/test/cmake/nx_secure_interoperability/run.sh b/test/cmake/nx_secure_interoperability/run.sh index 5635c6ff..3bb37f7c 100755 --- 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 $* \ No newline at end of file diff --git a/test/cmake/ptp/run.sh b/test/cmake/ptp/run.sh index 234f43c8..1c5c4c70 100755 --- 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/web/run.sh b/test/cmake/web/run.sh index 52d66e32..67a9d258 100755 --- 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 $* -- cgit v1.3.1 From a4b2a34d76413780a6cbb190ea0f6492b7122a88 Mon Sep 17 00:00:00 2001 From: Huan Nguyen Date: Thu, 15 May 2025 08:34:18 -0600 Subject: Update FileX submodule Need to update to include the CMake version changes so that the NetXDuo build scripts succeed. --- test/cmake/filex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cmake/filex b/test/cmake/filex index 1312f87f..9023227b 160000 --- a/test/cmake/filex +++ b/test/cmake/filex @@ -1 +1 @@ -Subproject commit 1312f87f3b90c73c8db3aa1ccbadf15c60fe04bb +Subproject commit 9023227ba4cf4e12d010daed121f5148b80403d9 -- cgit v1.3.1 From 8f9cf9207e94f02c23578d944b0875156efdfdf1 Mon Sep 17 00:00:00 2001 From: Huan Nguyen Date: Thu, 15 May 2025 08:41:36 -0600 Subject: Add newlines at EOF to comply with POSIX standard --- scripts/build_azure_iot.sh | 2 +- scripts/build_crypto.sh | 2 +- scripts/build_mqtt.sh | 2 +- scripts/build_mqtt_interoperability.sh | 2 +- scripts/build_nxd.sh | 2 +- scripts/build_nxd64.sh | 2 +- scripts/build_nxd_fast.sh | 2 +- scripts/build_ptp.sh | 2 +- scripts/build_secure.sh | 2 +- scripts/build_secure_interoperability.sh | 2 +- scripts/build_web.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/build_azure_iot.sh b/scripts/build_azure_iot.sh index dd8ef71a..f90ad57e 100755 --- a/scripts/build_azure_iot.sh +++ b/scripts/build_azure_iot.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/azure_iot/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_crypto.sh b/scripts/build_crypto.sh index 9e7329d5..2c6f3ea8 100755 --- a/scripts/build_crypto.sh +++ b/scripts/build_crypto.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/crypto/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_mqtt.sh b/scripts/build_mqtt.sh index 885b4e4c..775562bd 100755 --- a/scripts/build_mqtt.sh +++ b/scripts/build_mqtt.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/mqtt/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_mqtt_interoperability.sh b/scripts/build_mqtt_interoperability.sh index a38c5d8c..51955788 100755 --- a/scripts/build_mqtt_interoperability.sh +++ b/scripts/build_mqtt_interoperability.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/mqtt_interoperability/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_nxd.sh b/scripts/build_nxd.sh index deebfa80..b63c1a48 100755 --- a/scripts/build_nxd.sh +++ b/scripts/build_nxd.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_nxd64.sh b/scripts/build_nxd64.sh index d0286ed1..847d9f66 100755 --- a/scripts/build_nxd64.sh +++ b/scripts/build_nxd64.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo64/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_nxd_fast.sh b/scripts/build_nxd_fast.sh index f8dd186a..6eadddc1 100755 --- a/scripts/build_nxd_fast.sh +++ b/scripts/build_nxd_fast.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo_fast/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_ptp.sh b/scripts/build_ptp.sh index 9471d592..857812a8 100755 --- a/scripts/build_ptp.sh +++ b/scripts/build_ptp.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/ptp/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_secure.sh b/scripts/build_secure.sh index a969ab19..2e7e494b 100755 --- a/scripts/build_secure.sh +++ b/scripts/build_secure.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/nx_secure/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_secure_interoperability.sh b/scripts/build_secure_interoperability.sh index d1c4f497..d1fa6ea0 100755 --- a/scripts/build_secure_interoperability.sh +++ b/scripts/build_secure_interoperability.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/nx_secure_interoperability/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh diff --git a/scripts/build_web.sh b/scripts/build_web.sh index fb1ad44b..bce2ebab 100755 --- a/scripts/build_web.sh +++ b/scripts/build_web.sh @@ -3,4 +3,4 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")") RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/web/run.sh" -. ./func_build.sh \ No newline at end of file +. ./func_build.sh -- cgit v1.3.1 From 25c708167d8b4387ed13c5a274eeb02dad3fa984 Mon Sep 17 00:00:00 2001 From: Huan Nguyen Date: Thu, 15 May 2025 09:06:15 -0600 Subject: Fix URL for submodules to work for everyone --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22342415..278a2587 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ branch = 1.0.0 [submodule "test/cmake/filex"] path = test/cmake/filex - url = gh:eclipse-threadx/filex.git + url = https://github.com/eclipse-threadx/filex.git [submodule "test/cmake/threadx"] path = test/cmake/threadx - url = gh:eclipse-threadx/threadx.git + url = https://github.com/eclipse-threadx/threadx.git -- cgit v1.3.1