From 45fcf80a74b35ca72302f5a32902b7ce9974b77b Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Wed, 27 Jan 2016 16:14:48 +0100 Subject: [PATCH] build: fixed project setup * expanded setup script to create symbolic links * expanded clean script to remove symbolic links before deleting contents of Debug and Release folders. * fixed lines in tutorial so they don't exceed the limit of 80 chars. --- bin/app/data/projects/tutorial/src/search_tutorial_4.h | 4 ++-- script/clean.sh | 4 ++++ script/setup.sh | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bin/app/data/projects/tutorial/src/search_tutorial_4.h b/bin/app/data/projects/tutorial/src/search_tutorial_4.h index 3d4bb74c..4dca2877 100644 --- a/bin/app/data/projects/tutorial/src/search_tutorial_4.h +++ b/bin/app/data/projects/tutorial/src/search_tutorial_4.h @@ -12,8 +12,8 @@ // // 5 - FORWARD AND BACKWARD // You can use the buttons to the very left to go forward and backward, like -// in a web browser. They really come in handy in case you ask yourself something -// like "How did I end up here?" +// in a web browser. They really come in handy in case you ask yourself +// something like "How did I end up here?" // // 6 - REFRESH // The next button allows you to refresh the project in case you changed some diff --git a/script/clean.sh b/script/clean.sh index 57fd49fd..1f292b5e 100755 --- a/script/clean.sh +++ b/script/clean.sh @@ -6,6 +6,10 @@ SUCCESS="\033[32mSuccess:\033[00m" MY_PATH=`dirname "$0"` cd $MY_PATH/.. +# Remove symbolic links +cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Debug\data' & +cmd //c 'rmdir '.$MY_PATH.'\..\bin\app\Release\data' & + # Remove folders and contents rm -rf build rm -rf bin/app/Debug diff --git a/script/setup.sh b/script/setup.sh index 94e2710f..1ad6c1ff 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -32,8 +32,6 @@ echo -e $INFO "create build folders" mkdir -p build mkdir -p bin/app/Debug mkdir -p bin/app/Release -mkdir -p bin/gen/Debug -mkdir -p bin/gen/Release mkdir -p bin/lib/Debug mkdir -p bin/lib/Release mkdir -p bin/test/Debug @@ -50,6 +48,9 @@ if [ $PLATFORM == "Windows" ]; then echo -e $INFO "creating program icon" sh script/create_windows_icon.sh + + cmd //c 'mklink /d /j '.$MY_PATH.'\..\bin\app\Debug\data '.$MY_PATH.'\..\bin\app\data' & + cmd //c 'mklink /d /j '.$MY_PATH.'\..\bin\app\Release\data '.$MY_PATH.'\..\bin\app\data' & fi # Setup both Debug and Release configuration