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

[cpack_installer] few more small fixes to installer Jenkins scripts

Browse Source
This commit is contained in:
scottr
2021-06-02 14:57:18 -07:00
parent 4b40f23d0b
commit c6e4e3ed1f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Platform/Windows/build_windows.cmd
+1 -1
View File
@@ -40,7 +40,7 @@ SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
IF "%CMAKE_INCLUDE_WIX%"=="True" (
REM Explicitly enable wix via command line arg for forensic logging
SET EXTRA_CMAKE_OPTIONS=%EXTRA_CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
) ELSE (
REM Disable implicit enabling of windows packing by clearing out the wix variable
SET WIX=
scripts/build/build_node/Platform/Windows/install_utiltools.ps1
+1 -1
View File
@@ -30,5 +30,5 @@ choco install corretto8jdk -y --ia INSTALLDIR="c:\jdk8" # Custom directory to ha
# Install CMake
choco install cmake -y --installargs 'ADD_CMAKE_TO_PATH=System'
# Install WIX
# Install Windows Installer XML toolkit (WiX)
choco install wixtoolset -y