From e0ef501e6ad68ca3f75ffbb9d11e72c6d61570e7 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Sat, 25 May 2024 20:01:14 +0200 Subject: [PATCH] Merged WixUI files into a single extension folder --- .../ExtraDialogs/CommonExtra.wxs | 30 ------------------- .../WixUIExtension/ExtraDialogs/README.md | 9 ------ .../{ExtraDialogs => ui}/BrowseDlg.wxs | 0 .../Windows/WixUIExtension/ui/Common.wxs | 22 ++++++++++++++ .../{ExtraDialogs => ui}/CustomizeDlg.wxs | 0 .../{ExtraDialogs => ui}/DiskCostDlg.wxs | 0 .../LicenseAgreementDlg.wxs | 0 .../Windows/WixUIExtension/ui/README.md | 19 ++++++++++-- .../WixUI_FeatureTree.wxs | 0 9 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CommonExtra.wxs delete mode 100644 ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/README.md rename ReleaseBuilder/Resources/Windows/WixUIExtension/{ExtraDialogs => ui}/BrowseDlg.wxs (100%) rename ReleaseBuilder/Resources/Windows/WixUIExtension/{ExtraDialogs => ui}/CustomizeDlg.wxs (100%) rename ReleaseBuilder/Resources/Windows/WixUIExtension/{ExtraDialogs => ui}/DiskCostDlg.wxs (100%) rename ReleaseBuilder/Resources/Windows/WixUIExtension/{ExtraDialogs => ui}/LicenseAgreementDlg.wxs (100%) rename ReleaseBuilder/Resources/Windows/WixUIExtension/{ExtraDialogs => ui}/WixUI_FeatureTree.wxs (100%) diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CommonExtra.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CommonExtra.wxs deleted file mode 100644 index 817b7a1be..000000000 --- a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CommonExtra.wxs +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/README.md b/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/README.md deleted file mode 100644 index d200c8c44..000000000 --- a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Files from UI.wixext - -The files in this folder are adapted from [UI.wixext](https://github.com/wixtoolset/UI.wixext/tree/master/src/wixlib). -The adaptation is mostly to remove the use of localization (`!(loc.name)`) which is not supported by Wixl. -The actual strings are copied from `en-US` and inserted into `CommonExtra.wxs`. - -Some modification was required to avoid `"Error 2834: The next pointers on the dialog BrowseDlg do not form a single loop"`. - -The files are licensed under the [MS-RL](https://opensource.org/licenses/ms-rl) license. diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/BrowseDlg.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/BrowseDlg.wxs similarity index 100% rename from ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/BrowseDlg.wxs rename to ReleaseBuilder/Resources/Windows/WixUIExtension/ui/BrowseDlg.wxs diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/Common.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/Common.wxs index b0975dba6..7065f0408 100644 --- a/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/Common.wxs +++ b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/Common.wxs @@ -17,6 +17,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CustomizeDlg.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/CustomizeDlg.wxs similarity index 100% rename from ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/CustomizeDlg.wxs rename to ReleaseBuilder/Resources/Windows/WixUIExtension/ui/CustomizeDlg.wxs diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/DiskCostDlg.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/DiskCostDlg.wxs similarity index 100% rename from ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/DiskCostDlg.wxs rename to ReleaseBuilder/Resources/Windows/WixUIExtension/ui/DiskCostDlg.wxs diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/LicenseAgreementDlg.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/LicenseAgreementDlg.wxs similarity index 100% rename from ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/LicenseAgreementDlg.wxs rename to ReleaseBuilder/Resources/Windows/WixUIExtension/ui/LicenseAgreementDlg.wxs diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/README.md b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/README.md index e4ddd45ca..f1ffed102 100644 --- a/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/README.md +++ b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/README.md @@ -1,7 +1,20 @@ # WIX UI custom files -The contents of this folder is copied from the [Wixl UI extensions](https://gitlab.gnome.org/GNOME/msitools/-/tree/master/data/ext/ui). +The base contents of this folder are copied from the [Wixl UI extensions](https://gitlab.gnome.org/GNOME/msitools/-/tree/master/data/ext/ui). The [`Common.wxs`](./ui/Common.wxs) file has been modified to use the custom banners. +This was needed as it is not possible to pass outside strings/resources into the project as it is. -Unfortunately, there is not a simple way to override just one property, so all files are copied. -The files are licensed under the [MS-RL](https://opensource.org/licenses/ms-rl) license. +Some extra files are included from [UI.wixext](https://github.com/wixtoolset/UI.wixext/tree/master/src/wixlib). +The adaptation is mostly to remove the use of localization (`!(loc.name)`) which is not supported by Wixl. The actual strings are copied from `en-US` and inserted into `Common.wxs`. + +Also, the dialogs were modified to place the buttons as the first items in the dialog, because it otherwise causes the error: `"Error 2834: The next pointers on the dialog BrowseDlg do not form a single loop"`. + +The extra files are: + +- [`BrowseDlg.wxs`](./ui/BrowseDlg.wxs) +- [`CustomizeDlg.wxs`](./ui/CustomizeDlg.wxs) +- [`DiskCostDlg.wxs`](./ui/DiskCostDlg.wxs) +- [`LicenseAgreementDlg.wxs`](./ui/LicenseAgreementDlg.wxs) +- [`WixUI_FeatureTree.wxs`](./ui/WixUI_FeatureTree.wxs) + +The files are all licensed under the [MS-RL](https://opensource.org/licenses/ms-rl) license. diff --git a/ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/WixUI_FeatureTree.wxs b/ReleaseBuilder/Resources/Windows/WixUIExtension/ui/WixUI_FeatureTree.wxs similarity index 100% rename from ReleaseBuilder/Resources/Windows/WixUIExtension/ExtraDialogs/WixUI_FeatureTree.wxs rename to ReleaseBuilder/Resources/Windows/WixUIExtension/ui/WixUI_FeatureTree.wxs