summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Eaves <jinux@alluha.net>2020-12-22 11:38:57 +0000
committerJoe Eaves <jinux@alluha.net>2020-12-22 11:38:57 +0000
commit1f243aeedbc42349dbaba0ad3c2801606f4a5623 (patch)
treee87fe169dbf6061304d0b585ac7c699b2ba1a28a
parent186fee9337154bef4e6cda2c1d1d5268eb303c6a (diff)
Make TOOLS_DIR if needed
Added some extra dir names to gitignore
-rw-r--r--.gitignore8
-rwxr-xr-xdocker/build.sh3
2 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 8d416f85..100e2580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
.idea/
# CMake
-cmake-build-*/
-CMakeFiles/
+cmake-build-*
+cmake-*
+CMakeFiles
**/CMakeCache.txt
cmake_install.cmake
Makefile
-build/
+build
+tools
# Resulting binary files
*.a
diff --git a/docker/build.sh b/docker/build.sh
index 48dd9f33..f35c2f3a 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -20,6 +20,9 @@ MACHINE="$(uname -m)"
main() {
local target="$1"
+
+ mkdir -p "$TOOLS_DIR"
+
[[ ! -d "$TOOLS_DIR/$GCC_ARM_VER" ]] && GetGcc
[[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]] && GetNrfSdk
[[ ! -d "$TOOLS_DIR/mcuboot" ]] && GetMcuBoot