[script] moved cmake and ninja to requires packages -> needed now wit…

…h Lint requiring a node-build.
EskoDijk · Sep 10, 2024 · dd5d00d · dd5d00d
1 parent 80d1e1b
commit dd5d00d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/script/common.sh b/script/common.sh
@@ -102,7 +102,6 @@ function get_build_options()
 build_openthread()
 {
     get_openthread
-    install_openthread_buildtools
     (
         cd ot-rfsim
         ./script/build_latest "$(get_build_options)"
@@ -112,7 +111,6 @@ build_openthread()
 build_openthread_br()
 {
     get_openthread
-    install_openthread_buildtools
     (
         cd ot-rfsim
         ./script/build_br "$(get_build_options)"
@@ -122,7 +120,6 @@ build_openthread_br()
 build_openthread_versions()
 {
     get_openthread_versions
-    install_openthread_buildtools
     (
         cd ot-rfsim
         ./script/build_all "$(get_build_options)"

diff --git a/script/install-deps b/script/install-deps
@@ -39,6 +39,8 @@ install_packages()
     install_package git --apt git --brew git || true
     install_package cmake --apt cmake --brew cmake || true
     install_package g++ --apt build-essential --brew gcc || true
+    install_package cmake --apt cmake --brew cmake
+    install_package ninja --apt ninja-build --brew ninja
     install_package wget --apt wget --brew wget || true
     install_package unzip --apt unzip --brew unzip || true
     install_package python3 --apt python3 --brew python3 || true

diff --git a/script/utils.sh b/script/utils.sh
@@ -117,9 +117,3 @@ function install_pretty_tools()
     install_package shfmt --apt shfmt --brew shfmt
     install_package shellcheck --apt shellcheck --brew shellcheck
 }
-
-install_openthread_buildtools()
-{
-    install_package cmake --apt cmake --brew cmake
-    install_package ninja --apt ninja-build --brew ninja
-}