2
0
Эх сурвалжийг харах

Moved the old build system into tools/build_scripts.

David Piuva 10 сар өмнө
parent
commit
337e716a18

+ 1 - 1
Doc/Generator/Input/Starting.txt

@@ -88,7 +88,7 @@ Title2: Create your own cross-platform project
 *
 Copy the folder of a template program to where you want it.
 If you want a 3D application with animations, start from basic3D.
-If you want graphical user interface that only redrawn when something happens, start from basicGUI.
+If you want graphical user interface that only redrawns when something happens, start from basicGUI.
 If you want a command line interface application, start from basicCLI to only depend on the most essential parts of the library.
 
 *

+ 1 - 1
Doc/Starting.html

@@ -130,7 +130,7 @@ Make sure to manually erase object files in your temporary folder once in a whil
 <IMG SRC="Images/SmallDot.png">
 Copy the folder of a template program to where you want it.
 If you want a 3D application with animations, start from basic3D.
-If you want graphical user interface that only redrawn when something happens, start from basicGUI.
+If you want graphical user interface that only redrawns when something happens, start from basicGUI.
 If you want a command line interface application, start from basicCLI to only depend on the most essential parts of the library.
 
 </P><P>

+ 5 - 0
Source/DFPSR/History.txt

@@ -76,3 +76,8 @@ Changes from version 0.2.0 to version 0.3.0 (Performance, safety and template im
 	* Because the new string printing uses exact matching for basic types, bool is now printed as true or false instead of 1 or 0.
 		Cast to uint32_t if you want bool interpreted as an integer as before.
 		Does not affect PersistentBoolean.
+	* Folders have been reorganized to be less confusing for beginners.
+		Replace 'tools/build.sh' with 'tools/buildScripts/build.sh'.
+		Replace 'tools/buildAndRun.sh' with 'tools/buildScripts/buildAndRun.sh'.
+		Replace 'tools/buildLibrary.sh' with 'tools/buildScripts/buildLibrary.sh'.
+		Replace 'tools/clean.sh' with 'tools/buildScripts/clean.sh'.

+ 2 - 2
Source/SDK/cube/build.sh

@@ -18,6 +18,6 @@ COMPILER_FLAGS="${MODE} -std=c++14 -O2"
 LINKER_FLAGS=""
 
 # Give execution permission
-chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
+chmod +x ${ROOT_PATH}/tools/buildScripts/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";
+${ROOT_PATH}/tools/buildScripts/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";

+ 2 - 2
Source/SDK/fileFinder/build.sh

@@ -18,8 +18,8 @@ COMPILER_FLAGS="${MODE} -std=c++14 -O2"
 LINKER_FLAGS=""
 
 # Give execution permission
-chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
+chmod +x ${ROOT_PATH}/tools/buildScripts/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/build.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";
+${ROOT_PATH}/tools/buildScripts/build.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";
 # Run the application
 ${TARGET_FILE} ./পরীক্ষা;

+ 2 - 2
Source/SDK/guiExample/build.sh

@@ -18,6 +18,6 @@ COMPILER_FLAGS="${MODE} -std=c++14 -O2"
 LINKER_FLAGS=""
 
 # Give execution permission
-chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
+chmod +x ${ROOT_PATH}/tools/buildScripts/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";
+${ROOT_PATH}/tools/buildScripts/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";

+ 2 - 2
Source/SDK/sandbox/build.sh

@@ -18,6 +18,6 @@ COMPILER_FLAGS="${MODE} -std=c++14 -O2"
 LINKER_FLAGS=""
 
 # Give execution permission
-chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
+chmod +x ${ROOT_PATH}/tools/buildScripts/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDERS}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";
+${ROOT_PATH}/tools/buildScripts/buildAndRun.sh "${PROJECT_FOLDERS}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";

+ 2 - 2
Source/SDK/terrain/build.sh

@@ -18,6 +18,6 @@ COMPILER_FLAGS="${MODE} -std=c++14 -O2"
 LINKER_FLAGS=""
 
 # Give execution permission
-chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
+chmod +x ${ROOT_PATH}/tools/buildScripts/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";
+${ROOT_PATH}/tools/buildScripts/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${COMPILER_FLAGS}" "${LINKER_FLAGS}";

+ 1 - 1
Source/test.sh

@@ -8,7 +8,7 @@ DEBUGGER="-g"
 O_LEVEL=-O2
 
 chmod +x ${ROOT_PATH}/tools/build.sh;
-${ROOT_PATH}/tools/build.sh "NONE" "NONE" "${ROOT_PATH}" "${TEMP_ROOT}" "NONE" "${MODE} ${DEBUGGER} ${CPP_VERSION} ${O_LEVEL}";
+${ROOT_PATH}/tools/buildScripts/build.sh "NONE" "NONE" "${ROOT_PATH}" "${TEMP_ROOT}" "NONE" "${MODE} ${DEBUGGER} ${CPP_VERSION} ${O_LEVEL}";
 if [ $? -ne 0 ]
 then
 	exit 1

+ 5 - 5
Source/tools/build.sh → Source/tools/buildScripts/build.sh

@@ -16,14 +16,14 @@ TEMP_DIR=${TEMP_ROOT}/${TEMP_SUB}
 echo "Building version ${TEMP_SUB}"
 
 # Allow calling other scripts
-chmod +x ${ROOT_PATH}/tools/clean.sh
-chmod +x ${ROOT_PATH}/tools/buildLibrary.sh
+chmod +x ${ROOT_PATH}/tools/buildScripts/clean.sh
+chmod +x ${ROOT_PATH}/tools/buildScripts/buildLibrary.sh
 
 # Make a clean folder
-${ROOT_PATH}/tools/clean.sh ${TEMP_DIR}
+${ROOT_PATH}/tools/buildScripts/clean.sh ${TEMP_DIR}
 
 echo "Compiling renderer framework."
-${ROOT_PATH}/tools/buildLibrary.sh g++ ${ROOT_PATH}/DFPSR ${TEMP_DIR} "dfpsr" "${COMPILER_FLAGS}" LAZY
+${ROOT_PATH}/tools/buildScripts/buildLibrary.sh g++ ${ROOT_PATH}/DFPSR ${TEMP_DIR} "dfpsr" "${COMPILER_FLAGS}" LAZY
 if [ $? -ne 0 ]
 then
 	exit 1
@@ -36,7 +36,7 @@ then
 fi
 
 echo "Compiling application."
-${ROOT_PATH}/tools/buildLibrary.sh g++ "${PROJECT_FOLDERS}" ${TEMP_DIR} "application" "${COMPILER_FLAGS}" CLEAN
+${ROOT_PATH}/tools/buildScripts/buildLibrary.sh g++ "${PROJECT_FOLDERS}" ${TEMP_DIR} "application" "${COMPILER_FLAGS}" CLEAN
 if [ $? -ne 0 ]
 then
 	exit 1

+ 2 - 2
Source/tools/buildAndRun.sh → Source/tools/buildScripts/buildAndRun.sh

@@ -10,10 +10,10 @@ COMPILER_FLAGS=$6 # -DDEBUG/-DNDEBUG -std=c++14/-std=c++17 -O2/-O3
 LINKER_FLAGS=$7 # Additional linker flags for libraries and such
 
 # Allow calling the build script
-chmod +x ${ROOT_PATH}/tools/build.sh
+chmod +x ${ROOT_PATH}/tools/buildScripts/build.sh
 
 # Compile and link
-${ROOT_PATH}/tools/build.sh "$1" "$2" "$3" "$4" "$5" "$6" "$7"
+${ROOT_PATH}/tools/buildScripts/build.sh "$1" "$2" "$3" "$4" "$5" "$6" "$7"
 if [ $? -ne 0 ]
 then
 	exit 1

+ 0 - 0
Source/tools/buildLibrary.sh → Source/tools/buildScripts/buildLibrary.sh


+ 0 - 0
Source/tools/clean.sh → Source/tools/buildScripts/clean.sh