[java-identity-provider] 03/07: IDP-2147 Investigate Wix V4

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/IDP-2147
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=74e64cb480ee0ee7903a13d59fdb304111cc9fe4

commit 74e64cb480ee0ee7903a13d59fdb304111cc9fe4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Nov 7 16:13:38 2023 +0000

    IDP-2147 Investigate Wix V4
    
    https://shibboleth.atlassian.net/browse/IDP-2147
    
    Changes to allow a clean compile
---
 idp-msi/src/main/wix/ShibbolethIdP-delete.wxs | 6 +++---
 idp-msi/src/main/wix/ShibbolethIdP-gui.wxs    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs b/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
index 0c0343b4a..33f568425 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
@@ -25,9 +25,9 @@
         <CustomAction Id="SetOldBinLib" Property="OldBinLib" Value="[INSTALLDIR]\bin\lib" />
 
 	<InstallExecuteSequence>
-            <Custom Action="SetOldSystem" After="WixRemoveFoldersEx" />
-            <Custom Action="SetOldWebApp" After="WixRemoveFoldersEx" />
-            <Custom Action="SetOldBinLib" After="WixRemoveFoldersEx" />
+            <Custom Action="SetOldSystem" After="Wix4RemoveFoldersEx_$(sys.BUILDARCHSHORT)" />
+            <Custom Action="SetOldWebApp" After="Wix4RemoveFoldersEx_$(sys.BUILDARCHSHORT)" />
+            <Custom Action="SetOldBinLib" After="Wix4RemoveFoldersEx_$(sys.BUILDARCHSHORT)" />
         </InstallExecuteSequence>
 
     </Fragment>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs b/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
index 7fd456a30..9e7e671af 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
@@ -74,7 +74,7 @@
         <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4" Condition="WIXUI_INSTALLDIR_VALID<>"1"" />
 
         <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlgShib" Condition="LicenseAccepted = "1"" />
-
+ <Publish Dialog="LicenseAgreementDlg" Control="Print"  Event="DoAction" Value="WixUIPrintEula_$(sys.BUILDARCHSHORT)" />
         <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
         <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.