update build process to enable CI

TexasInstruments · Jul 14, 2023 · bfef79d · bfef79d
1 parent 8bec26b
commit bfef79d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,7 @@ In a Bash terminal, follow these instructions to install the GNU toolchain and o
 
 ```bash
 $ cd <path-to-ot-cc13x2-cc26x2>
+$ git submodule update --init
 $ ./script/bootstrap
 ```
 

diff --git a/script/bootstrap b/script/bootstrap
@@ -29,15 +29,14 @@
 
 set -euxo pipefail
 
-SYSCONFIG=~/ti/sysconfig_1.14.0/
+SYSCONFIG_USER=~/ti/sysconfig_1.14.0/
+SYSCONFIG_SYSTEM=/opt/ti/sysconfig_1.14.0/
 SYSCONFIG_DL=https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.14.0.2667/sysconfig-1.14.0_2667-setup.run
 
-if [ ! -d "$SYSCONFIG" ]; then
+if [ ! -d "$SYSCONFIG_USER" ] && [ ! -d "$SYSCONFIG_SYSTEM"]; then
     wget "$SYSCONFIG_DL" -O /tmp/sysconfig-1.14.0_2667-setup.run
     chmod +x /tmp/sysconfig-1.14.0_2667-setup.run
     /tmp/sysconfig-1.14.0_2667-setup.run --mode unattended
 fi
 
-git submodule update --init
-
 "$(dirname "$0")"/../openthread/script/bootstrap
diff --git a/script/build b/script/build
@@ -30,6 +30,18 @@
 set -euxo pipefail
 
 OT_CMAKE_NINJA_TARGET=${OT_CMAKE_NINJA_TARGET:-}
+TI_SYSCONFIG_ROOT=${TI_SYSCONFIG_ROOT:-}
+
+SYSCONFIG_USER=~/ti/sysconfig_1.14.0/
+SYSCONFIG_SYSTEM=/opt/ti/sysconfig_1.14.0/
+
+if [ -z "$TI_SYSCONFIG_ROOT" ]; then
+    if [ -d "$SYSCONFIG_USER" ]; then
+        TI_SYSCONFIG_ROOT="$SYSCONFIG_USER"
+    elif [ -d "$SYSCONFIG_SYSTEM" ]; then
+        TI_SYSCONFIG_ROOT="$SYSCONFIG_SYSTEM"
+    fi
+fi
 
 readonly TI_LAUNCHPAD=(
     CC1352P1_LAUNCHXL

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,7 +26,9 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-if(NOT DEFINED TI_SYSCONFIG_INSTALL_DIR)
+if(NOT $ENV{TI_SYSCONFIG_ROOT} STREQUAL "")
+    set(TI_SYSCONFIG_INSTALL_DIR $ENV{TI_SYSCONFIG_ROOT} CACHE PATH "")
+else()
     set(TI_SYSCONFIG_INSTALL_DIR $ENV{HOME}/ti/sysconfig_1.14.0 CACHE PATH "")
 endif()
 

diff --git a/third_party/ti_simplelink_sdk/CMakeLists.txt b/third_party/ti_simplelink_sdk/CMakeLists.txt
@@ -26,7 +26,9 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-if(NOT DEFINED TI_SIMPLELINK_SDK_DIR)
+if(NOT $ENV{TI_SIMPLELINK_SDK_DIR} STREQUAL "")
+    set(TI_SIMPLELINK_SDK_DIR $ENV{TI_SIMPLELINK_SDK_DIR} CACHE PATH "")
+else()
     set(TI_SIMPLELINK_SDK_DIR ${PROJECT_SOURCE_DIR}/third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx CACHE PATH "")
 endif()
-Original file line number
+Diff line change
@@ Expand Up @@
     ```bash
     $ cd <path-to-ot-cc13x2-cc26x2>
+    $ git submodule update --init
     $ ./script/bootstrap
     ```
@@ Expand Down @@