Restored build and run scripts to their prior versions.

23 files changed, 40 insertions, 59 deletions

diff --git a/scripts/build_azure_iot.sh b/scripts/build_azure_iot.sh
index f90ad57e..3b7bec71 100755
--- a/scripts/build_azure_iot.sh
+++ b/scripts/build_azure_iot.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/azure_iot/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/azure_iot/run.sh build all
\ No newline at end of file
diff --git a/scripts/build_crypto.sh b/scripts/build_crypto.sh
index 2c6f3ea8..451194ad 100755
--- a/scripts/build_crypto.sh
+++ b/scripts/build_crypto.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/crypto/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/crypto/run.sh build all
diff --git a/scripts/build_mqtt.sh b/scripts/build_mqtt.sh
index 775562bd..25014531 100755
--- a/scripts/build_mqtt.sh
+++ b/scripts/build_mqtt.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/mqtt/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/mqtt/run.sh build all
diff --git a/scripts/build_mqtt_interoperability.sh b/scripts/build_mqtt_interoperability.sh
index 51955788..573c8e6d 100755
--- a/scripts/build_mqtt_interoperability.sh
+++ b/scripts/build_mqtt_interoperability.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/mqtt_interoperability/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/mqtt_interoperability/run.sh build all
diff --git a/scripts/build_nxd.sh b/scripts/build_nxd.sh
index b63c1a48..2512fb67 100755
--- a/scripts/build_nxd.sh
+++ b/scripts/build_nxd.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/netxduo/run.sh build all
diff --git a/scripts/build_nxd64.sh b/scripts/build_nxd64.sh
index 847d9f66..93fc15c1 100755
--- a/scripts/build_nxd64.sh
+++ b/scripts/build_nxd64.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo64/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/netxduo64/run.sh build all
diff --git a/scripts/build_nxd_fast.sh b/scripts/build_nxd_fast.sh
index 6eadddc1..cf9ba54d 100755
--- a/scripts/build_nxd_fast.sh
+++ b/scripts/build_nxd_fast.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/netxduo_fast/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/netxduo_fast/run.sh build all
diff --git a/scripts/build_ptp.sh b/scripts/build_ptp.sh
index 857812a8..6f715749 100755
--- a/scripts/build_ptp.sh
+++ b/scripts/build_ptp.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/ptp/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/ptp/run.sh build all
diff --git a/scripts/build_secure.sh b/scripts/build_secure.sh
index 2e7e494b..d1c77c02 100755
--- a/scripts/build_secure.sh
+++ b/scripts/build_secure.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/nx_secure/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/nx_secure/run.sh build all
diff --git a/scripts/build_secure_interoperability.sh b/scripts/build_secure_interoperability.sh
index d1fa6ea0..a1ada03b 100755
--- a/scripts/build_secure_interoperability.sh
+++ b/scripts/build_secure_interoperability.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/nx_secure_interoperability/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/nx_secure_interoperability/run.sh build all
diff --git a/scripts/build_web.sh b/scripts/build_web.sh
index bce2ebab..a8bee025 100755
--- a/scripts/build_web.sh
+++ b/scripts/build_web.sh
@@ -1,6 +1,3 @@
 #! /bin/bash
 
-SCRIPT_DIR=$(dirname "$(realpath "$0")")
-RUN_SCRIPT="$SCRIPT_DIR/../test/cmake/web/run.sh"
-
-. ./func_build.sh
+$(dirname `realpath $0`)/../test/cmake/web/run.sh build all
diff --git a/scripts/func_build.sh b/scripts/func_build.sh
deleted file mode 100644
index d6f0d9ce..00000000
--- a/scripts/func_build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /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 76dac392..266c4d13 100755
--- a/test/cmake/azure_iot/run.sh
+++ b/test/cmake/azure_iot/run.sh
@@ -48,6 +48,8 @@ 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 67a9d258..4ce326b4 100755
--- a/test/cmake/crypto/run.sh
+++ b/test/cmake/crypto/run.sh
@@ -2,5 +2,7 @@
 
 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 3bb37f7c..84a4eb24 100755
--- a/test/cmake/mqtt/run.sh
+++ b/test/cmake/mqtt/run.sh
@@ -2,5 +2,8 @@
 
 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 827f8943..fa9d3829 100755
--- a/test/cmake/mqtt_interoperability/run.sh
+++ b/test/cmake/mqtt_interoperability/run.sh
@@ -2,5 +2,8 @@ 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 3bb37f7c..84a4eb24 100755
--- a/test/cmake/netxduo/run.sh
+++ b/test/cmake/netxduo/run.sh
@@ -2,5 +2,8 @@
 
 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 36c1ad06..ad59df07 100755
--- a/test/cmake/netxduo64/run.sh
+++ b/test/cmake/netxduo64/run.sh
@@ -2,5 +2,8 @@
 
 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 3bb37f7c..84a4eb24 100755
--- a/test/cmake/netxduo_fast/run.sh
+++ b/test/cmake/netxduo_fast/run.sh
@@ -2,5 +2,8 @@
 
 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 3bb37f7c..5635c6ff 100755
--- a/test/cmake/nx_secure/run.sh
+++ b/test/cmake/nx_secure/run.sh
@@ -2,5 +2,7 @@
 
 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 3bb37f7c..5635c6ff 100755
--- a/test/cmake/nx_secure_interoperability/run.sh
+++ b/test/cmake/nx_secure_interoperability/run.sh
@@ -2,5 +2,7 @@
 
 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 1c5c4c70..234f43c8 100755
--- a/test/cmake/ptp/run.sh
+++ b/test/cmake/ptp/run.sh
@@ -2,5 +2,8 @@
 
 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 67a9d258..52d66e32 100755
--- a/test/cmake/web/run.sh
+++ b/test/cmake/web/run.sh
@@ -2,5 +2,8 @@
 
 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 $*