birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for paths with spaces (#6757)

Browse Source 
* Some fixes for paths with spaces

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2022-01-10 10:00:29 -08:00
committed by GitHub
parent 93996bfb3f
commit 0f7e55cf59
11 changed files with 71 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Platform/Linux/build_linux.sh
+1 -1
View File
@@ -17,7 +17,7 @@ SOURCE_DIRECTORY=${PWD}
pushd $OUTPUT_DIRECTORY
LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
CONFIGURE_CMD="cmake '${SOURCE_DIRECTORY}' ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
if [[ -n "$CMAKE_LY_PROJECTS" ]]; then
CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'"
fi
scripts/build/Platform/Mac/build_mac.sh
+1 -1
View File
@@ -17,7 +17,7 @@ SOURCE_DIRECTORY=${PWD}
pushd $OUTPUT_DIRECTORY
LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
CONFIGURE_CMD="cmake ${SOURCE_DIRECTORY} ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
CONFIGURE_CMD="cmake '${SOURCE_DIRECTORY}' ${CMAKE_OPTIONS} ${EXTRA_CMAKE_OPTIONS}"
if [[ -n "$CMAKE_LY_PROJECTS" ]]; then
CONFIGURE_CMD="${CONFIGURE_CMD} -DLY_PROJECTS='${CMAKE_LY_PROJECTS}'"
fi
scripts/build/Platform/Windows/build_windows.cmd
+2 -3
View File
@@ -8,8 +8,7 @@ REM
REM
SETLOCAL EnableDelayedExpansion
CALL %~dp0env_windows.cmd
CALL "%~dp0env_windows.cmd"
IF NOT EXIST "%OUTPUT_DIRECTORY%" (
MKDIR %OUTPUT_DIRECTORY%.
@@ -29,7 +28,7 @@ REM Compute half the amount of processors so some jobs can run
SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS%
SET CONFIGURE_CMD=cmake "%SOURCE_DIRECTORY%" %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS%
IF NOT "%CMAKE_LY_PROJECTS%"=="" (
SET CONFIGURE_CMD=!CONFIGURE_CMD! -DLY_PROJECTS="%CMAKE_LY_PROJECTS%"
)
scripts/build/ci_build.py
+1 -1
View File
@@ -88,7 +88,7 @@ def build(build_config_filename, build_platform, build_type):
env_params[v] = build_params[v]
print(' {} = {} {}'.format(v, env_params[v], '(environment override)' if existing_param else ''))
print('--------------------------------------------------------------------------------', flush=True)
process_return = subprocess.run(build_cmd_path, cwd=cwd_dir, env=env_params)
process_return = subprocess.run([build_cmd_path], cwd=cwd_dir, env=env_params)
print('--------------------------------------------------------------------------------')
if process_return.returncode != 0:
print('[ci_build] FAIL: Command {} returned {}'.format(build_cmd_path, process_return.returncode), flush=True)