From 4491104889e18f36ebbb319c49c90967d875d22e Mon Sep 17 00:00:00 2001 From: scottr Date: Mon, 14 Jun 2021 15:39:07 -0700 Subject: [PATCH 01/13] [cpack/stabilization/2106] update installer license UX (legal request) --- .../Packaging/BootstrapperTheme.wxl.in | 3 +-- .../Packaging/BootstrapperTheme.xml.in | 4 +--- .../Platform/Windows/Packaging_windows.cmake | 22 ++++++++++++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in index fe125cfdfe..364413efa6 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in @@ -14,8 +14,7 @@ Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit. - [WixBundleName] <a href="#">license terms</a>. - I &agree to the license terms and conditions + By installing, you agree to the @WIX_THEME_EULA_ACCEPTANCE_TEXT@ &Options &Install &Close diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 61b338cc13..ffae03de94 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -14,9 +14,7 @@ - @WIX_THEME_INSTALL_LICENSE_ELEMENT@ - - #(loc.InstallAcceptCheckbox) +@WIX_THEME_INSTALL_LICENSE_ELEMENTS@ diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index aec0edeee2..f09a631372 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -91,23 +91,33 @@ set(CPACK_WIX_EXTENSIONS set(_embed_artifacts "yes") +set(_hyperlink_license " + #(loc.InstallEulaAcceptance) +") + +set(_raw_text_license " + + #(loc.InstallEulaAcceptance) +") + if(LY_INSTALLER_DOWNLOAD_URL) if(LY_INSTALLER_LICENSE_URL) - set(WIX_THEME_INSTALL_LICENSE_ELEMENT - "#(loc.InstallLicenseLinkText)" - ) + set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license}) + set(WIX_THEME_EULA_ACCEPTANCE_TEXT "<a href=\"#\">Terms of Use</a>") else() - set(WIX_THEME_INSTALL_LICENSE_ELEMENT - "" - ) + set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_raw_text_license}) + set(WIX_THEME_EULA_ACCEPTANCE_TEXT "Terms of Use above") endif() + # theme ux file configure_file( "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in" "${CPACK_BINARY_DIR}/BootstrapperTheme.xml" @ONLY ) + + # theme localization file configure_file( "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in" "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl" From 2444ad58de3dcbe4cbb8c8fac16ebc649a91dae7 Mon Sep 17 00:00:00 2001 From: scottr Date: Mon, 14 Jun 2021 17:18:41 -0700 Subject: [PATCH 02/13] [cpack/stabilization/2106] replaced bootstrapper font with correct one --- cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index ffae03de94..1151aabf6d 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -3,10 +3,10 @@ #(loc.WindowTitle) - Segoe UI - Segoe UI - Segoe UI - Segoe UI + Open Sans + Open Sans + Open Sans + Open Sans From ac872f8f5967e186a2a20e3ed2cea55c2fb0157e Mon Sep 17 00:00:00 2001 From: scottr Date: Mon, 14 Jun 2021 19:12:56 -0700 Subject: [PATCH 03/13] [cpack/stabilization/2106] update installer bundle name to include [Developer Preview] --- cmake/Platform/Windows/Packaging/Bootstrapper.wxs | 2 +- cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs index fd8aa68b77..c7146b1b7f 100644 --- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs +++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs @@ -5,7 +5,7 @@ - - [WixBundleName] Setup + [WixBundleName] Release [WixBundleVersion] Setup [WixBundleName] Version [WixBundleVersion] Are you sure you want to cancel? From df64d4ca56a59fd24f434969cdbf864bb7706641 Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 08:35:40 -0700 Subject: [PATCH 04/13] [cpack/stabilization/2106] bootrapper banner updates - replaced logo and removed text --- cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in | 1 - cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in | 3 +-- cmake/Platform/Windows/Packaging/product_logo.png | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in index 53c74e4ef2..6d0291c849 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in @@ -5,7 +5,6 @@ [WixBundleName] Release [WixBundleVersion] Setup - [WixBundleName] Version [WixBundleVersion] Are you sure you want to cancel? diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 1151aabf6d..f592bffca8 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -9,8 +9,7 @@ Open Sans - - #(loc.Title) + diff --git a/cmake/Platform/Windows/Packaging/product_logo.png b/cmake/Platform/Windows/Packaging/product_logo.png index ac9c06f8f1..1941b2ff8a 100644 --- a/cmake/Platform/Windows/Packaging/product_logo.png +++ b/cmake/Platform/Windows/Packaging/product_logo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c804a6be619b9f35cad46eab30b94def7a4ac7142a92cb3f7c78a659381d834 +oid sha256:e7aaee03713eccd1ca4f909288ae16c9c563b2ac8d32a9e246bbb2eb941b47c7 size 11074 From 2d5fe7b835ec2d46d9c5c8cee0e9b3c52b67c4b2 Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 12:30:18 -0700 Subject: [PATCH 05/13] [cpack/stabilization/2106] resize bootstrapper windows size and adjust center elements --- .../Packaging/BootstrapperTheme.xml.in | 48 ++++++++++--------- .../Platform/Windows/Packaging_windows.cmake | 6 +-- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index f592bffca8..c4a0415f26 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -1,7 +1,7 @@ - #(loc.WindowTitle) + #(loc.WindowTitle) Open Sans Open Sans @@ -9,7 +9,7 @@ Open Sans - + @@ -21,11 +21,11 @@ - #(loc.OptionsHeader) + #(loc.OptionsHeader) - #(loc.OptionsLocationLabel) - - + #(loc.OptionsLocationLabel) + + @@ -33,7 +33,7 @@ - #(loc.ModifyHeader) + #(loc.ModifyHeader) @@ -42,21 +42,21 @@ - #(loc.ProgressHeader) + #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) @@ -64,21 +64,23 @@ - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - + #(loc.FailureHyperlinkLogText) + - #(loc.HelpHeader) - #(loc.HelpText) + #(loc.HelpHeader) + + #(loc.HelpText) + diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index f09a631372..0e4b408637 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -92,12 +92,12 @@ set(CPACK_WIX_EXTENSIONS set(_embed_artifacts "yes") set(_hyperlink_license " - #(loc.InstallEulaAcceptance) + #(loc.InstallEulaAcceptance) ") set(_raw_text_license " - - #(loc.InstallEulaAcceptance) + + #(loc.InstallEulaAcceptance) ") if(LY_INSTALLER_DOWNLOAD_URL) From 0108953586bea16018b248408be3bcb537212942 Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 12:51:44 -0700 Subject: [PATCH 06/13] [cpack/stabilization/2106] added: welcome page title, package full name. updated: install page title, vendor --- cmake/Packaging.cmake | 6 ++++-- cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in | 4 ++-- cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index 6c077ac617..2f001cf7ee 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -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) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in index 6d0291c849..85f8799775 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in @@ -9,7 +9,7 @@ Are you sure you want to cancel? - Welcome + Welcome to @CPACK_PACKAGE_FULL_NAME@! Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit. @@ -32,7 +32,7 @@ Setup will install [WixBundleName] on your computer. Click install to continue, &Close - Setup Progress + Installing @CPACK_PACKAGE_FULL_NAME@... Processing: Initializing... &Cancel diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index c4a0415f26..0e198c4236 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -13,6 +13,7 @@ + #(loc.InstallHeader) @WIX_THEME_INSTALL_LICENSE_ELEMENTS@ From 6c96ad89c49c2d92d1c2ebd358f51bc0be89a21f Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 13:26:14 -0700 Subject: [PATCH 07/13] [cpack/stabilization/2106] updated failure state page layout to include warning image --- .../Windows/Packaging/BootstrapperTheme.wxl.in | 4 +++- .../Windows/Packaging/BootstrapperTheme.xml.in | 13 +++++++------ cmake/Platform/Windows/Packaging/warning.png | 3 +++ cmake/Platform/Windows/Packaging_windows.cmake | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 cmake/Platform/Windows/Packaging/warning.png diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in index 85f8799775..7da81d0397 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in @@ -51,7 +51,9 @@ Setup will install [WixBundleName] on your computer. Click install to continue, Uninstall Failed Repair Failed -One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. +One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information, see the log file. + +<a href="#">View Log File</a> &Close diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 0e198c4236..bb1023ae0c 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -65,13 +65,14 @@ - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - + #(loc.FailureHyperlinkLogText) + diff --git a/cmake/Platform/Windows/Packaging/warning.png b/cmake/Platform/Windows/Packaging/warning.png new file mode 100644 index 0000000000..75a5fd75a7 --- /dev/null +++ b/cmake/Platform/Windows/Packaging/warning.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d727994fd1819f7ff01d56e2d2f59c1fe2ed1e839156e70e3d2dec93d54ca04 +size 566 diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index 0e4b408637..3c2b5214f2 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -102,6 +102,8 @@ set(_raw_text_license " if(LY_INSTALLER_DOWNLOAD_URL) + set(WIX_THEME_WARNING_IMAGE ${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/warning.png) + if(LY_INSTALLER_LICENSE_URL) set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license}) set(WIX_THEME_EULA_ACCEPTANCE_TEXT "<a href=\"#\">Terms of Use</a>") From e309afb0775078607a0a659aa442a6e53e5564da Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 14:01:54 -0700 Subject: [PATCH 08/13] [cpack/stabilization/2106] font cleanup --- .../Packaging/BootstrapperTheme.xml.in | 82 ++++++++++--------- .../Platform/Windows/Packaging_windows.cmake | 6 +- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index bb1023ae0c..5c4cf2b7f4 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -1,88 +1,92 @@ - #(loc.WindowTitle) + #(loc.WindowTitle) - Open Sans - Open Sans - Open Sans - Open Sans + + Open Sans + + Open Sans + + Open Sans - #(loc.InstallHeader) + #(loc.InstallHeader) + @WIX_THEME_INSTALL_LICENSE_ELEMENTS@ - - - + + + + - #(loc.OptionsHeader) + #(loc.OptionsHeader) - #(loc.OptionsLocationLabel) - - + #(loc.OptionsLocationLabel) + + - - + + - #(loc.ModifyHeader) + #(loc.ModifyHeader) - - - + + + - #(loc.ProgressHeader) + #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) - + - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) - - + + - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - + #(loc.FailureHyperlinkLogText) + - + - #(loc.HelpHeader) + #(loc.HelpHeader) - #(loc.HelpText) + #(loc.HelpText) - + diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index 3c2b5214f2..8e2f68fddc 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -92,12 +92,12 @@ set(CPACK_WIX_EXTENSIONS set(_embed_artifacts "yes") set(_hyperlink_license " - #(loc.InstallEulaAcceptance) + #(loc.InstallEulaAcceptance) ") set(_raw_text_license " - - #(loc.InstallEulaAcceptance) + + #(loc.InstallEulaAcceptance) ") if(LY_INSTALLER_DOWNLOAD_URL) From e82a782ca81d50f18d865f7c225af82d878c7c2d Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 14:11:38 -0700 Subject: [PATCH 09/13] [cpack/stabilization/2106] fixed a couple ux issues that cropped up in the re-layout --- cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 5c4cf2b7f4..8a50181732 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -50,7 +50,7 @@ #(loc.ProgressHeader) #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) + #(loc.OverallProgressPackageText) @@ -69,7 +69,7 @@ - + #(loc.FailureHeader) #(loc.FailureInstallHeader) #(loc.FailureUninstallHeader) From f4f30099482f226c72c0416f5a6ba23184ef95dd Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 14:45:08 -0700 Subject: [PATCH 10/13] [cpack/stabilization/2106] re-layout bottom button bar --- .../Packaging/BootstrapperTheme.xml.in | 35 ++++++++++++------- .../Platform/Windows/Packaging_windows.cmake | 4 +-- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 8a50181732..2d61868694 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -9,6 +9,8 @@ Open Sans Open Sans + + Open Sans @@ -19,9 +21,10 @@ @WIX_THEME_INSTALL_LICENSE_ELEMENTS@ - - - + + + + @@ -32,17 +35,19 @@ - - + + + #(loc.ModifyHeader) - - - + + + + @@ -53,7 +58,8 @@ #(loc.OverallProgressPackageText) - + + @@ -63,8 +69,9 @@ #(loc.SuccessRepairHeader) #(loc.SuccessUninstallHeader) - - + + + @@ -78,7 +85,8 @@ #(loc.FailureHyperlinkLogText) - + + @@ -87,6 +95,7 @@ #(loc.HelpText) - + + diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index 8e2f68fddc..c882215030 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -96,8 +96,8 @@ set(_hyperlink_license " ") set(_raw_text_license " - - #(loc.InstallEulaAcceptance) + + #(loc.InstallEulaAcceptance) ") if(LY_INSTALLER_DOWNLOAD_URL) From 91dec06f66badef3f94385a760eec72ac0a475f8 Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 15:56:14 -0700 Subject: [PATCH 11/13] [cpack/stabilization/2106] minor tweaks: increased button height to fit admin icon, fixed button bar background size issue, fixed progress text overwrite bug --- .../Packaging/BootstrapperTheme.xml.in | 44 +++++++++---------- .../Platform/Windows/Packaging_windows.cmake | 4 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 2d61868694..03b5e339e3 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -21,10 +21,10 @@ @WIX_THEME_INSTALL_LICENSE_ELEMENTS@ - - - - + + + + @@ -35,19 +35,19 @@ - - - + + + #(loc.ModifyHeader) - - - - + + + + @@ -55,11 +55,11 @@ #(loc.ProgressHeader) #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) + #(loc.OverallProgressPackageText) - - + + @@ -69,14 +69,14 @@ #(loc.SuccessRepairHeader) #(loc.SuccessUninstallHeader) - - - + + + - + #(loc.FailureHeader) #(loc.FailureInstallHeader) #(loc.FailureUninstallHeader) @@ -85,8 +85,8 @@ #(loc.FailureHyperlinkLogText) - - + + @@ -95,7 +95,7 @@ #(loc.HelpText) - - + + diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index c882215030..5df53d158c 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -96,8 +96,8 @@ set(_hyperlink_license " ") set(_raw_text_license " - - #(loc.InstallEulaAcceptance) + + #(loc.InstallEulaAcceptance) ") if(LY_INSTALLER_DOWNLOAD_URL) From ba1979b6fc4f2e7ae355cdc1dd9e3ed3babe92c9 Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 18:42:21 -0700 Subject: [PATCH 12/13] [cpack/stabilization/2106] fixed various text entries getting clipped after reinstalling the font --- .../Packaging/BootstrapperTheme.xml.in | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in index 03b5e339e3..f9a177b646 100644 --- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in +++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in @@ -17,7 +17,7 @@ - #(loc.InstallHeader) + #(loc.InstallHeader) @WIX_THEME_INSTALL_LICENSE_ELEMENTS@ @@ -29,9 +29,9 @@ - #(loc.OptionsHeader) + #(loc.OptionsHeader) - #(loc.OptionsLocationLabel) + #(loc.OptionsLocationLabel) @@ -42,7 +42,7 @@ - #(loc.ModifyHeader) + #(loc.ModifyHeader) @@ -52,10 +52,10 @@ - #(loc.ProgressHeader) + #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) @@ -64,10 +64,10 @@ - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) @@ -77,10 +77,10 @@ - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) #(loc.FailureHyperlinkLogText) @@ -91,7 +91,7 @@ - #(loc.HelpHeader) + #(loc.HelpHeader) #(loc.HelpText) From 084430f0c951188f4b63b810f0ae1d980aaada8d Mon Sep 17 00:00:00 2001 From: scottr Date: Tue, 15 Jun 2021 19:17:51 -0700 Subject: [PATCH 13/13] [cpack/stabilization/2106] update xml strings to use cmake bracket argument --- cmake/Platform/Windows/Packaging_windows.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake index 5df53d158c..6dc806ff56 100644 --- a/cmake/Platform/Windows/Packaging_windows.cmake +++ b/cmake/Platform/Windows/Packaging_windows.cmake @@ -91,14 +91,14 @@ set(CPACK_WIX_EXTENSIONS set(_embed_artifacts "yes") -set(_hyperlink_license " - #(loc.InstallEulaAcceptance) -") +set(_hyperlink_license [[ + #(loc.InstallEulaAcceptance) +]]) -set(_raw_text_license " - - #(loc.InstallEulaAcceptance) -") +set(_raw_text_license [[ + + #(loc.InstallEulaAcceptance) +]]) if(LY_INSTALLER_DOWNLOAD_URL)