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

[cpack/stabilization/2106] added: welcome page title, package full name. updated: install page title, vendor

Browse Source
This commit is contained in:
scottr
2021-06-15 12:51:44 -07:00
parent 2d5fe7b835
commit 0108953586
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Packaging.cmake
+4 -2
View File
@@ -26,7 +26,9 @@ set(CPACK_DESIRED_CMAKE_VERSION 3.20.2)
# when the platform specific settings are applied below. additionally, any variable with
# the "CPACK_" prefix will automatically be cached for use in any phase of cpack namely
# pre/post build
set(CPACK_PACKAGE_VENDOR "${PROJECT_NAME}")
set(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
set(CPACK_PACKAGE_FULL_NAME "Open3D Engine")
set(CPACK_PACKAGE_VENDOR "TBD")
set(CPACK_PACKAGE_VERSION "${LY_VERSION_STRING}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Installation Tool")
@@ -39,7 +41,7 @@ set(DEFAULT_LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_LICENSE ${DEFAULT_LICENSE_FILE})
set(CPACK_LICENSE_URL ${LY_INSTALLER_LICENSE_URL})
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
# neither of the SOURCE_DIR variables equate to anything during execution of pre/post build scripts
set(CPACK_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+2 -2
View File
@@ -9,7 +9,7 @@
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
<!-- welcome page -->
<String Id="InstallHeader">Welcome</String>
<String Id="InstallHeader">Welcome to @CPACK_PACKAGE_FULL_NAME@!</String>
<String Id="InstallMessage">
Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.
</String>
@@ -32,7 +32,7 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
<String Id="ModifyCloseButton">&amp;Close</String>
<!-- action progress page -->
<String Id="ProgressHeader">Setup Progress</String>
<String Id="ProgressHeader">Installing @CPACK_PACKAGE_FULL_NAME@...</String>
<String Id="ProgressLabel">Processing:</String>
<String Id="OverallProgressPackageText">Initializing...</String>
<String Id="ProgressCancelButton">&amp;Cancel</String>
cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+1
View File
@@ -13,6 +13,7 @@
<!-- welcome page -->
<Page Name="Install">
<Text X="38" Y="142" Width="-42" Height="30" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Text>
@WIX_THEME_INSTALL_LICENSE_ELEMENTS@
<Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
<Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>