Move top level cmakelist up to main directory

bootstrap.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # Double check for cmakelist
-if [ ! -e "source/CMakeLists.txt" ]; then
+if [ ! -e "CMakeLists.txt" ]; then
 	echo "TTRTS: No source cmakelist found"
 	exit
 fi
@@ -10,7 +10,7 @@ fi
 echo "TTRTS: Running cmake"
 test ! -e build && mkdir build
 cd build/
-cmake ../source
+cmake ..
 if [[ $? != 0 ]]; then
     echo "TTRTS: CMake failed, exiting Bootstrap"
     exit
@@ -26,7 +26,7 @@ fi
 
 # Run tests
 echo "TTRTS: Running tests"
-./test/ttrts-test
+./source/test/ttrts-test
 if [[ $? != 0 ]]; then
     echo "TTRTS: Tests failed, build must be broken"
     exit
@@ -34,23 +34,21 @@ fi
 
 # Generate maps
 echo "TTRTS: Generating maps"
-./../scripts/gen_maps.sh "$PWD/gen/ttrts-gen"
+cd ..
+./scripts/gen_maps.sh "$PWD/build/source/gen/ttrts-gen"
 if [[ $? != 0 ]]; then
     echo "TTRTS: Failed to generate maps, exiting Bootstrap"
     exit
 fi
-# Copy these maps into parent directory
-cp -rf maps ..
 
 # Move binaries
 echo "TTRTS: Moving binaries"
-cd ..
-if [ ! -e build/client/ttrts ]; then
+if [ ! -e build/source/client/ttrts ]; then
     echo "TTRTS: No TTRTS Binary found, something has gone wrong"
     exit
 fi
 
-cp build/client/ttrts .
+cp build/source/client/ttrts .
 chmod a+x ttrts
 
 echo "TTRTS: Bootstrap complete"