From 4491104889e18f36ebbb319c49c90967d875d22e Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Mon, 14 Jun 2021 15:39:07 -0700
Subject: [PATCH] [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 @@
     <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>
-    <String Id="InstallLicenseLinkText">[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
-    <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
+    <String Id="InstallEulaAcceptance">By installing, you agree to the @WIX_THEME_EULA_ACCEPTANCE_TEXT@</String>
     <String Id="InstallOptionsButton">&amp;Options</String>
     <String Id="InstallInstallButton">&amp;Install</String>
     <String Id="InstallCloseButton">&amp;Close</String>
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 @@
 
     <!-- welcome page -->
     <Page Name="Install">
-        @WIX_THEME_INSTALL_LICENSE_ELEMENT@
-
-        <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
+@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>
         <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
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 "
+        <Hypertext Name=\"EulaHyperlink\" X=\"11\" Y=\"121\" Width=\"-11\" Height=\"51\" TabStop=\"yes\" FontId=\"3\" HideWhenDisabled=\"yes\">#(loc.InstallEulaAcceptance)</Hypertext>
+")
+
+set(_raw_text_license "
+        <Richedit Name=\"EulaRichedit\" X=\"11\" Y=\"80\" Width=\"-11\" Height=\"-70\" TabStop=\"yes\" FontId=\"0\" HexStyle=\"0x800000\" />
+        <Text Name=\"EulaAcceptance\" X=\"11\" Y=\"-41\" Width=\"-11\" Height=\"17\" TabStop=\"yes\" FontId=\"3\" HideWhenDisabled=\"yes\">#(loc.InstallEulaAcceptance)</Text>
+")
+
 if(LY_INSTALLER_DOWNLOAD_URL)
 
     if(LY_INSTALLER_LICENSE_URL)
-        set(WIX_THEME_INSTALL_LICENSE_ELEMENT
-            "<Hypertext Name=\"EulaHyperlink\" X=\"11\" Y=\"121\" Width=\"-11\" Height=\"51\" TabStop=\"yes\" FontId=\"3\" HideWhenDisabled=\"yes\">#(loc.InstallLicenseLinkText)</Hypertext>"
-        )
+        set(WIX_THEME_INSTALL_LICENSE_ELEMENTS ${_hyperlink_license})
+        set(WIX_THEME_EULA_ACCEPTANCE_TEXT "&lt;a href=\"#\"&gt;Terms of Use&lt;/a&gt;")
     else()
-        set(WIX_THEME_INSTALL_LICENSE_ELEMENT
-            "<Richedit Name=\"EulaRichedit\" X=\"11\" Y=\"80\" Width=\"-11\" Height=\"-70\" TabStop=\"yes\" FontId=\"0\" HexStyle=\"0x800000\" />"
-        )
+        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"