From 836a1532cc58026497120b2b0477be6b5d6b01d4 Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Wed, 23 Oct 2019 14:19:00 +0200 Subject: [PATCH] ~ build script fixed + checkout dev branches script --- build.sh | 12 ++++++++++-- checkout-dev.sh | 16 ++++++++++++++++ install.sh | 2 +- update.sh | 4 ++-- 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 checkout-dev.sh diff --git a/build.sh b/build.sh index 56007cc..5ac5fe3 100755 --- a/build.sh +++ b/build.sh @@ -4,11 +4,19 @@ echo 'building all components' cd .. +#building library first +cd library/build +cmake .. +make +make test +cd ../.. + for d in */; do cd "$d" FILE=build - if [ -f $FILE ]; then - echo 'building component ' + $d + echo $d + if [ -d $FILE ]; then + echo 'building component ' $d cd build cmake .. make diff --git a/checkout-dev.sh b/checkout-dev.sh new file mode 100644 index 0000000..901c2b7 --- /dev/null +++ b/checkout-dev.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +cd .. + +for d in */; do + cd "$d" + FILE=build + if [ -d $FILE ]; then + git checkout dev + fi + + cd .. +done + +cd +./build.sh \ No newline at end of file diff --git a/install.sh b/install.sh index c41912a..a8b46c5 100755 --- a/install.sh +++ b/install.sh @@ -78,7 +78,7 @@ mkdir simple-draw/build git clone ssh://git@gitlab.repo.digitech.hs-emden-leer.de:2222/link/projekte/ws19/vkvm-new/demo.git mkdir demo/build -cd Scripts +cd installation echo "installation completed" ./build.sh \ No newline at end of file diff --git a/update.sh b/update.sh index c63d817..a164227 100755 --- a/update.sh +++ b/update.sh @@ -7,8 +7,8 @@ cd .. for d in */; do cd "$d" FILE=build - if [ -f $FILE ]; then - echo 'updating componenent ' + $d + if [ -d $FILE ]; then + echo 'updating componenent ' $d git pull fi