From 4f0d98044aaeeb2f54f51d3ab3d9d003ab6fbcda Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Tue, 17 Sep 2024 09:00:05 -0700 Subject: [PATCH] WiX: optionalise `plutil` through a hidden option Add an option to elide `plutil` from installation. This is a tiny binary that is useful, but distributions may wish to remove it. Adjust the installer labels and also force install the runtime now that the compiler depends on it. --- platforms/Windows/bundle/installer.wxs | 2 ++ platforms/Windows/bundle/theme.xml | 2 +- platforms/Windows/rtl/lib/rtllib.wxs | 3 +++ platforms/Windows/rtl/msi/rtlmsi.wxs | 5 +++++ platforms/Windows/rtl/msm/rtlmsm.wxs | 1 + platforms/Windows/shared/swift.en-us.wxl | 11 +++++++---- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 5da5f34f..1137736c 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -32,6 +32,7 @@ + @@ -67,6 +68,7 @@ SourceFile="!(bindpath.rtl)\rtl.msi" DownloadUrl="$(BaseReleaseDownloadUrl)/{2}"> + #(loc.Cli_ProductName) #(loc.Dbg_ProductName) #(loc.Ide_ProductName) - #(loc.Rtl_ProductName) + #(loc.Rtl_ProductName) #(loc.Sdk_ProductName_amd64) #(loc.Redist_amd64) #(loc.Sdk_ProductName_arm64) diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs index 4d25f936..9ce66319 100644 --- a/platforms/Windows/rtl/lib/rtllib.wxs +++ b/platforms/Windows/rtl/lib/rtllib.wxs @@ -105,6 +105,9 @@ + + + diff --git a/platforms/Windows/rtl/msi/rtlmsi.wxs b/platforms/Windows/rtl/msi/rtlmsi.wxs index 4991f8fd..039ba057 100644 --- a/platforms/Windows/rtl/msi/rtlmsi.wxs +++ b/platforms/Windows/rtl/msi/rtlmsi.wxs @@ -31,5 +31,10 @@ + + + + + diff --git a/platforms/Windows/rtl/msm/rtlmsm.wxs b/platforms/Windows/rtl/msm/rtlmsm.wxs index 434b4e98..becee0be 100644 --- a/platforms/Windows/rtl/msm/rtlmsm.wxs +++ b/platforms/Windows/rtl/msm/rtlmsm.wxs @@ -15,5 +15,6 @@ Version="$(NonSemVerProductVersion)"> + diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl index 06698a45..89881e3c 100644 --- a/platforms/Windows/shared/swift.en-us.wxl +++ b/platforms/Windows/shared/swift.en-us.wxl @@ -6,16 +6,19 @@ - + - - - + + + + + +