From 68e9454abe2ce3e53d2059e04a38a7af53a8a1e4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 27 Mar 2024 10:05:54 -0400 Subject: Utilities/Release/WiX: Require Windows Installer 5.0 This version comes with Windows 7, the oldest our binaries support. --- Utilities/Release/WiX/WIX.template.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Release/WiX/WIX.template.in b/Utilities/Release/WiX/WIX.template.in index 1f8953b..d18883e 100644 --- a/Utilities/Release/WiX/WIX.template.in +++ b/Utilities/Release/WiX/WIX.template.in @@ -12,7 +12,7 @@ Manufacturer="$(var.CPACK_PACKAGE_VENDOR)" UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)"> - + -- cgit v0.12 From 9e831a6211b3a19f2675ecb6595a9ee50f60c399 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 27 Mar 2024 10:22:27 -0400 Subject: Utilities/Release/WiX: Simplify specification of CMake registry value --- Utilities/Release/WiX/WIX.template.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Utilities/Release/WiX/WIX.template.in b/Utilities/Release/WiX/WIX.template.in index d18883e..f48f782 100644 --- a/Utilities/Release/WiX/WIX.template.in +++ b/Utilities/Release/WiX/WIX.template.in @@ -39,16 +39,13 @@ - - - - + + - + -- cgit v0.12 From 36ae046ed10a42b3bdea4695926ce52b0fb52828 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Mar 2024 13:29:35 -0400 Subject: Utilities/Release/WiX: Simplify desktop shortcut condition --- Utilities/Release/WiX/patch_desktop_shortcut.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Release/WiX/patch_desktop_shortcut.xml b/Utilities/Release/WiX/patch_desktop_shortcut.xml index d30705d..8ec2c12 100644 --- a/Utilities/Release/WiX/patch_desktop_shortcut.xml +++ b/Utilities/Release/WiX/patch_desktop_shortcut.xml @@ -1,5 +1,5 @@ - DESKTOP_SHORTCUT_REQUESTED = 1 + DESKTOP_SHORTCUT_REQUESTED -- cgit v0.12 From 48d2a7ac62a5d5e9fcdde89aaad00e0256d5afe0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Mar 2024 11:24:01 -0400 Subject: Utilities/Release/WiX: Backport UI dialog condition fix from WiX 3.11 See WiX issue 4737 and wix3 PR 284. --- Utilities/Release/WiX/install_dir.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/Release/WiX/install_dir.wxs b/Utilities/Release/WiX/install_dir.wxs index b0e795a..ec64edf 100644 --- a/Utilities/Release/WiX/install_dir.wxs +++ b/Utilities/Release/WiX/install_dir.wxs @@ -25,7 +25,7 @@ 1 - "1"]]> + "1"]]> 1 -- cgit v0.12 From cde0b7c13133754fd7fa7cdc45c7c69e0d17a1eb Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 27 Mar 2024 10:10:42 -0400 Subject: Utilities/Release/WiX: Clarify UI dialog order --- Utilities/Release/WiX/install_dir.wxs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Utilities/Release/WiX/install_dir.wxs b/Utilities/Release/WiX/install_dir.wxs index ec64edf..fd756b9 100644 --- a/Utilities/Release/WiX/install_dir.wxs +++ b/Utilities/Release/WiX/install_dir.wxs @@ -35,6 +35,9 @@ 1 LicenseAccepted = "1" + 1 + 1 + 1 1 NOT WIXUI_DONTVALIDATEPATH @@ -47,9 +50,6 @@ 1 1 - 1 - 1 - NOT Installed Installed AND NOT PATCH Installed AND PATCH -- cgit v0.12 From d320c76257febde76728ba53468b349d56d9f0fe Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 28 Mar 2024 09:01:59 -0400 Subject: Utilities/Release/WiX: Clarify UI options dialog name --- CMakeCPackOptions.cmake.in | 2 +- Utilities/Release/WiX/cmake_extra_dialog.wxs | 36 ---------------------------- Utilities/Release/WiX/install_dir.wxs | 10 ++++---- Utilities/Release/WiX/options_dlg.wxs | 36 ++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 Utilities/Release/WiX/cmake_extra_dialog.wxs create mode 100644 Utilities/Release/WiX/options_dlg.wxs diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 00ffe5e..e8583b0 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -265,7 +265,7 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") set(CPACK_WIX_EXTRA_SOURCES "@CMake_SOURCE_DIR@/Utilities/Release/WiX/install_dir.wxs" - "@CMake_SOURCE_DIR@/Utilities/Release/WiX/cmake_extra_dialog.wxs" + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/options_dlg.wxs" ) set(_WIX_CUSTOM_ACTION_ENABLED "@CMake_BUILD_WIX_CUSTOM_ACTION@") diff --git a/Utilities/Release/WiX/cmake_extra_dialog.wxs b/Utilities/Release/WiX/cmake_extra_dialog.wxs deleted file mode 100644 index 247b627..0000000 --- a/Utilities/Release/WiX/cmake_extra_dialog.wxs +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Utilities/Release/WiX/install_dir.wxs b/Utilities/Release/WiX/install_dir.wxs index fd756b9..d7debde 100644 --- a/Utilities/Release/WiX/install_dir.wxs +++ b/Utilities/Release/WiX/install_dir.wxs @@ -8,7 +8,7 @@ - + @@ -33,12 +33,12 @@ Installed AND PATCH 1 - LicenseAccepted = "1" + LicenseAccepted = "1" - 1 - 1 + 1 + 1 - 1 + 1 1 NOT WIXUI_DONTVALIDATEPATH "1"]]> diff --git a/Utilities/Release/WiX/options_dlg.wxs b/Utilities/Release/WiX/options_dlg.wxs new file mode 100644 index 0000000..c8f5a7b --- /dev/null +++ b/Utilities/Release/WiX/options_dlg.wxs @@ -0,0 +1,36 @@ + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12 From 7bd68cf381470642266595392b0dda5eef5ca55d Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 27 Mar 2024 10:13:41 -0400 Subject: Utilities/Release/WiX: Convert PATH modification preference to checkbox Add explicit support for passing a `ADD_CMAKE_TO_PATH={0,1}` property to `msiexec` command-line installations to control the checkbox. Also preserve compatibility with the old `ADD_CMAKE_TO_PATH={None,System}` property, which previously controlled the radio button group, by mapping the values to the checkbox. Remove the "Add CMake to the system PATH for the current user" option. It actually added CMake to the installing user's PATH, not the system PATH, even though CMake is installed to a system location. Also revise the wording of the desktop shortcut checkbox to match the style of the PATH checkbox wording. Issue: #21465 --- CMakeCPackOptions.cmake.in | 1 + Utilities/Release/WiX/options.wxs | 18 ++++++++++++++++++ Utilities/Release/WiX/options_dlg.wxs | 14 +++----------- Utilities/Release/WiX/patch_path_env.xml | 11 +++++------ 4 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 Utilities/Release/WiX/options.wxs diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index e8583b0..cbe73e7 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -265,6 +265,7 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") set(CPACK_WIX_EXTRA_SOURCES "@CMake_SOURCE_DIR@/Utilities/Release/WiX/install_dir.wxs" + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/options.wxs" "@CMake_SOURCE_DIR@/Utilities/Release/WiX/options_dlg.wxs" ) diff --git a/Utilities/Release/WiX/options.wxs b/Utilities/Release/WiX/options.wxs new file mode 100644 index 0000000..2c76bb7 --- /dev/null +++ b/Utilities/Release/WiX/options.wxs @@ -0,0 +1,18 @@ + + + + + + + + + + ADD_CMAKE_TO_PATH = "0" + ADD_CMAKE_TO_PATH = "1" + + ADD_CMAKE_TO_PATH = "None" + ADD_CMAKE_TO_PATH = "System" AND ALLUSERS + + ADD_CMAKE_TO_PATH = "User" AND NOT ALLUSERS + + diff --git a/Utilities/Release/WiX/options_dlg.wxs b/Utilities/Release/WiX/options_dlg.wxs index c8f5a7b..4d27d00 100644 --- a/Utilities/Release/WiX/options_dlg.wxs +++ b/Utilities/Release/WiX/options_dlg.wxs @@ -1,7 +1,7 @@ - + @@ -17,18 +17,10 @@ - - - - - - - - - + - + diff --git a/Utilities/Release/WiX/patch_path_env.xml b/Utilities/Release/WiX/patch_path_env.xml index 0e335c4..ba4316d 100644 --- a/Utilities/Release/WiX/patch_path_env.xml +++ b/Utilities/Release/WiX/patch_path_env.xml @@ -1,18 +1,17 @@ + - - ADD_CMAKE_TO_PATH = "System" - + CMAKE_IN_PATH AND ALLUSERS + + - - ADD_CMAKE_TO_PATH = "User" - + CMAKE_IN_PATH AND NOT ALLUSERS -- cgit v0.12