From 3cb15f1754733acaef29e6c6fe977cacaceec08e Mon Sep 17 00:00:00 2001
From: malte_langkabel <malte.langkabel@gmail.com>
Date: Fri, 15 Apr 2016 13:57:46 +0200
Subject: [PATCH] build: script fixes

* regex removed in hook since it was not working on windows.
* fixed method for getting the script's path for windows. using this in setup and clean script.
* fixed missing include in cmakelists
---
 CMakeLists.txt                   |  1 +
 script/clean.sh                  | 26 ++++++++++++++++++--------
 script/setup.sh                  | 23 ++++++++++++++++-------
 setup/git/git_pre_commit_hook.sh |  2 +-
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ae3249d..6e44d7ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,6 +312,7 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
+		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
 )
 
 set_target_properties(
diff --git a/script/clean.sh b/script/clean.sh
index 7cda845b..313622e5 100755
--- a/script/clean.sh
+++ b/script/clean.sh
@@ -12,17 +12,27 @@ elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
 	PLATFORM='Windows'
 fi
 
-# Enter masterproject directory
-MY_PATH=`dirname "$0"`
-cd $MY_PATH/..
 
 if [ $PLATFORM == "Windows" ]; then
-    # Remove symbolic links
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Debug\data' &
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Debug\user' &
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Release\data' &
-    cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Release\user' &
+	ORIGINAL_PATH_TO_SCRIPT="${0}"
+	CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+	ROOT_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
+else
+	ROOT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+fi
 
+ROOT_DIR=$ROOT_DIR/..
+
+# Enter masterproject directory
+cd $ROOT_DIR/
+
+if [ $PLATFORM == "Windows" ]; then
+	BACKSLASHED_ROOT_DIR="${ROOT_DIR//\//\\}"
+    # Remove symbolic links
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\user' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Release\data' &
+    cmd //c 'rmdir '$BACKSLASHED_ROOT_DIR'\bin\app\Release\user' &
 fi
 
 # Remove folders and contents
diff --git a/script/setup.sh b/script/setup.sh
index ae4c55c5..21bc8bbd 100755
--- a/script/setup.sh
+++ b/script/setup.sh
@@ -14,10 +14,17 @@ elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
 	PLATFORM='Windows'
 fi
 
+if [ $PLATFORM == "Windows" ]; then
+	ORIGINAL_PATH_TO_SCRIPT="${0}"
+	CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+	ROOT_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
+else
+	ROOT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+fi
+
+ROOT_DIR=$ROOT_DIR/..
+
 # Enter masterproject directory
-SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
-ROOT_DIR=$SCRIPT_DIR/..
-MY_PATH=`dirname "$0"`
 cd $ROOT_DIR
 
 # git settings
@@ -51,10 +58,12 @@ if [ $PLATFORM == "Windows" ]; then
 	echo -e $INFO "creating program icon"
 	sh script/create_windows_icon.sh
 
-	cmd //c 'mklink /d /j '.$ROOT_DIR.'\bin\app\Debug\data '.$ROOT_DIR.'\bin\app\data' &
-	cmd //c 'mklink /d /j '.$ROOT_DIR.'\bin\app\Debug\user '.$ROOT_DIR.'\bin\app\user' &
-	cmd //c 'mklink /d /j '.$ROOT_DIR.'\bin\app\Release\data '.$ROOT_DIR.'\bin\app\data' &
-	cmd //c 'mklink /d /j '.$ROOT_DIR.'\bin\app\Release\user '.$ROOT_DIR.'\bin\app\user' &
+	BACKSLASHED_ROOT_DIR="${ROOT_DIR//\//\\}"
+
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Debug\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Release\data '$BACKSLASHED_ROOT_DIR'\bin\app\data' &
+	cmd //c 'mklink /d /j '$BACKSLASHED_ROOT_DIR'\bin\app\Release\user '$BACKSLASHED_ROOT_DIR'\bin\app\user' &
 elif [ $PLATFORM == "Linux" ]; then
 	echo -e $INFO "create symbolic links for data"
 	cd $ROOT_DIR/bin/app/Release
diff --git a/setup/git/git_pre_commit_hook.sh b/setup/git/git_pre_commit_hook.sh
index 57a429b9..3222ae63 100755
--- a/setup/git/git_pre_commit_hook.sh
+++ b/setup/git/git_pre_commit_hook.sh
@@ -71,7 +71,7 @@ function run_tests {
 }
 
 #testing before commiting to a publish branch
-if [[ $BRANCH_NAME =~ ^_publish_.*_$ ]]
+if [[ ${BRANCH_NAME:0:9} == "_publish_"  ]]
 then
 	echo Try to publish
 	echo Run builds and test