From 9ebb46f1b5cbacc659f0f697f6e3f34e3310fcda Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Mon, 6 Feb 2017 10:57:51 +0100 Subject: [PATCH] script: updated build.sh script and git_pre_commit hook to new build directory --- script/build.sh | 12 ++++++------ setup/git/git_pre_commit_hook.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/script/build.sh b/script/build.sh index 162c064c..42d19aa6 100755 --- a/script/build.sh +++ b/script/build.sh @@ -19,28 +19,28 @@ then if [ "$2" = "test" ] then #echo "release test" - cd bin/test && ../../build/Release/Release/test/Coati_test + cd bin/test && ../../build/Release/test/Coati_test elif [ "$2" = "keygen" ] then #echo "release keygen" - cd bin/license_generator && ../../build/Release/Release/license_generator/Coati_license_generator + cd bin/license_generator && ../../build/Release/license_generator/Coati_license_generator else #echo "release app" - cd bin/app && ../../build/Release/Release/app/Coati + cd bin/app && ../../build/Release/app/Coati fi elif [ "$1" = "debug" ] || [ "$1" = "d" ] then if [ "$2" = "test" ] then #echo "debug test" - cd bin/test && ../../build/Debug/Debug/test/Coati_test + cd bin/test && ../../build/Debug/test/Coati_test elif [ "$2" = "keygen" ] then #echo "debug keygen" - cd bin/license_generator && ../../build/Debug/Debug/license_generator/Coati_license_generator + cd bin/license_generator && ../../build/Debug/license_generator/Coati_license_generator else #echo "debug app" - cd bin/app && ../../build/Debug/Debug/app/Coati + cd bin/app && ../../build/Debug/app/Coati fi else echo "no arguments: first argument 'release' or 'debug', second argument 'test' for tests" diff --git a/setup/git/git_pre_commit_hook.sh b/setup/git/git_pre_commit_hook.sh index 4180e8bd..e619dc86 100755 --- a/setup/git/git_pre_commit_hook.sh +++ b/setup/git/git_pre_commit_hook.sh @@ -58,7 +58,7 @@ function run_tests { cd bin/test echo $1/Coati_test - $1/Coati_test + ../../build/$1/test/Coati_test if [ $? -eq 0 ] then echo -e $PASS $1 Tests passed