Parcourir la source

Placed script arguments in strings to handle grouped arguments.

David Piuva il y a 5 ans
Parent
commit
0fe822c9cc

+ 3 - 1
Source/SDK/cube/build.sh

@@ -17,9 +17,11 @@ MODE=-DDEBUG #Debug mode
 CPP_VERSION=-std=c++14
 # Select optimization level
 O_LEVEL=-O2
+# Select external libraries
+LINKER_FLAGS=""
 
 # Give execution permission
 chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh ${PROJECT_FOLDER} ${TARGET_FILE} ${ROOT_PATH} ${TEMP_DIR} ${WINDOW_MANAGER} ${MODE} ${CPP_VERSION} ${O_LEVEL};
+${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${MODE}" "${CPP_VERSION}" "${O_LEVEL}" "${LINKER_FLAGS}";
 

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

@@ -23,5 +23,5 @@ LINKER_FLAGS=""
 # Give execution permission
 chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh ${PROJECT_FOLDER} ${TARGET_FILE} ${ROOT_PATH} ${TEMP_DIR} ${WINDOW_MANAGER} ${MODE} ${CPP_VERSION} ${O_LEVEL} ${LINKER_FLAGS};
+${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${MODE}" "${CPP_VERSION}" "${O_LEVEL}" "${LINKER_FLAGS}";
 

+ 1 - 1
Source/SDK/raspiCam/build.sh

@@ -23,5 +23,5 @@ LINKER_FLAGS="-lraspicam"
 # Give execution permission
 chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh ${PROJECT_FOLDER} ${TARGET_FILE} ${ROOT_PATH} ${TEMP_DIR} ${WINDOW_MANAGER} ${MODE} ${CPP_VERSION} ${O_LEVEL} ${LINKER_FLAGS};
+${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${MODE}" "${CPP_VERSION}" "${O_LEVEL}" "${LINKER_FLAGS}";
 

+ 3 - 1
Source/SDK/sandbox/build.sh

@@ -17,9 +17,11 @@ MODE=-DNDEBUG #Release mode
 CPP_VERSION=-std=c++14
 # Select optimization level
 O_LEVEL=-O2
+# Select external libraries
+LINKER_FLAGS=""
 
 # Give execution permission
 chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh ${PROJECT_FOLDER} ${TARGET_FILE} ${ROOT_PATH} ${TEMP_DIR} ${WINDOW_MANAGER} ${MODE} ${CPP_VERSION} ${O_LEVEL};
+${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${MODE}" "${CPP_VERSION}" "${O_LEVEL}" "${LINKER_FLAGS}";
 

+ 3 - 1
Source/SDK/terrain/build.sh

@@ -17,9 +17,11 @@ MODE=-DDEBUG #Debug mode
 CPP_VERSION=-std=c++14
 # Select optimization level
 O_LEVEL=-O2
+# Select external libraries
+LINKER_FLAGS=""
 
 # Give execution permission
 chmod +x ${ROOT_PATH}/tools/buildAndRun.sh;
 # Compile everything
-${ROOT_PATH}/tools/buildAndRun.sh ${PROJECT_FOLDER} ${TARGET_FILE} ${ROOT_PATH} ${TEMP_DIR} ${WINDOW_MANAGER} ${MODE} ${CPP_VERSION} ${O_LEVEL};
+${ROOT_PATH}/tools/buildAndRun.sh "${PROJECT_FOLDER}" "${TARGET_FILE}" "${ROOT_PATH}" "${TEMP_DIR}" "${WINDOW_MANAGER}" "${MODE}" "${CPP_VERSION}" "${O_LEVEL}" "${LINKER_FLAGS}";
 

+ 1 - 1
Source/test.sh

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