[cpack/jenkins-main] update installer job params and how they are applied

This commit is contained in:
scottr
2021-06-20 14:45:03 -07:00
parent e8f250bed8
commit 3ca839a580
3 changed files with 4 additions and 6 deletions
@@ -314,8 +314,8 @@
"PARAMETERS": {
"CONFIGURATION": "profile",
"OUTPUT_DIRECTORY": "build\\windows_vs2019",
"CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE",
"EXTRA_CMAKE_OPTIONS": "-DCPACK_WIX_ROOT=\"!WIX! \" -DLY_INSTALLER_DOWNLOAD_URL=https://dkb1uj4hs9ikv.cloudfront.net -DLY_INSTALLER_LICENSE_URL=https://example.com",
"CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DCPACK_WIX_ROOT=\"!WIX! \"",
"EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=ON -DLY_INSTALLER_DOWNLOAD_URL=https://dkb1uj4hs9ikv.cloudfront.net -DLY_INSTALLER_LICENSE_URL=https://example.com",
"CPACK_BUCKET": "spectra-prism-staging-us-west-2",
"CMAKE_LY_PROJECTS": "",
"CMAKE_TARGET": "ALL_BUILD",
@@ -10,8 +10,6 @@ REM remove or modify any license notices. This file is distributed on an "AS IS"
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM
SET "LY_INSTALLER_UPLOAD_URL=s3://%CPACK_BUCKET%"
CALL "%~dp0build_windows.cmd"
IF NOT %ERRORLEVEL%==0 GOTO :error
@@ -50,8 +50,8 @@ IF ERRORLEVEL 1 (
GOTO :popd_error
)
ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION%
"!CPACK_PATH!" -C %CONFIGURATION%
ECHO [ci_build] "!CPACK_PATH!" -C %CONFIGURATION% -D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%
"!CPACK_PATH!" -C %CONFIGURATION% -D CPACK_UPLOAD_URL=s3://%CPACK_BUCKET% %CPACK_OPTIONS%
IF NOT %ERRORLEVEL%==0 (
REM dump the log file generated by cpack specifically for WIX
ECHO ****************************************************************