[java-identity-provider] 02/08: IDP-2147 Investigate Wix V4
Rod Widdowson
rdw at steadingsoftware.com
Tue Mar 19 11:34:12 UTC 2024
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=758dba2eafa9771844976527b34d7566b490e650
commit 758dba2eafa9771844976527b34d7566b490e650
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Nov 7 15:38:57 2023 +0000
IDP-2147 Investigate Wix V4
https://shibboleth.atlassian.net/browse/IDP-2147
Initial convert of unchanged wix sources
---
.../src/main/wix/ShibbolethIdP-adconfig-dlg.wxs | 12 ++--
idp-msi/src/main/wix/ShibbolethIdP-delete.wxs | 7 +-
idp-msi/src/main/wix/ShibbolethIdP-gui.wxs | 74 ++++++++--------------
idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs | 29 ++++-----
idp-msi/src/main/wix/ShibbolethIdP-main.wxs | 58 ++++++++---------
idp-msi/src/main/wix/ShibbolethIdP-registry.wxs | 15 ++---
idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs | 11 ++--
idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs | 13 ++--
8 files changed, 92 insertions(+), 127 deletions(-)
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
index 529f903a8..c2193631a 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-adconfig-dlg.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,7 +10,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This file contains the description of the dialog which captures installation
values for first time installs -->
<Fragment>
@@ -56,15 +54,15 @@
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="InstallDirDlgShib">1</Publish>
+ <Publish Event="NewDialog" Value="InstallDirDlgShib" />
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="NewDialog" Value="WarnDlgShib">1</Publish>
+ <Publish Event="NewDialog" Value="WarnDlgShib" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs b/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
index 305e1cb23..0c0343b4a 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-delete.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,10 +10,10 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!-- Explicit delete behind ourselves on installs -->
<Fragment>
- <Component Id="DeleteFiles" Guid="{923639F2-93DB-4A07-A864-BB6857257900}" Win64="no" Directory="INSTALLDIR">
+ <Component Id="DeleteFiles" Guid="{923639F2-93DB-4A07-A864-BB6857257900}" Directory="INSTALLDIR" Bitness="always32">
<RegistryValue Id="RemoveOldWebApp" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="RemoveOldWebApp" Value="TRUE" Type="string" KeyPath="yes" />
<util:RemoveFolderEx On="install" Property="OldWebAPP" />
<util:RemoveFolderEx On="install" Property="OldSystem" />
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs b/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
index 81bd9dce5..7fd456a30 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-gui.wxs
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,7 +10,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" >
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
<Fragment>
<WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\license.rtf" />
@@ -72,50 +70,30 @@
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
<!-- Events (from Orca\ControlEvent and from light"s complaints) -->
- <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
- <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4">
- WIXUI_INSTALLDIR_VALID<>"1"
- </Publish>
-
- <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlgShib">
- LicenseAccepted = "1"
- </Publish>
-
- <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-
- <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">
- (NOT Installed) AND (NOT ALREADYINSTALLED)
- </Publish>
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib">
- (NOT Installed) AND ALREADYINSTALLED
- </Publish>
- <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">
- Installed AND PATCH
- </Publish>
-
- <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return">1</Publish>
- <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
- <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">
- Installed AND PATCH
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfigADDlg">
- (NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD="TRUE"
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib">
- (NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD <>"TRUE"
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib">
- (NOT Installed) AND ALREADYINSTALLED
- </Publish>
- <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">
- Installed AND NOT PATCH
- </Publish>
-
- <ProgressText Action="QtIdpInstall">Performing IdP Installation tasks; this may take some time.</ProgressText>
+ <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Order="3" />
+ <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="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
+ <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
+
+ <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
+
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED)" />
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="UpdateDlgShib" Condition="(NOT Installed) AND ALREADYINSTALLED" />
+ <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
+
+ <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" />
+ <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
+ <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Condition="Installed AND PATCH" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ConfigADDlg" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD="TRUE"" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlgShib" Condition="(NOT Installed) AND (NOT ALREADYINSTALLED) AND CONFIGURE_AD <>"TRUE"" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="UpdateDlgShib" Condition="(NOT Installed) AND ALREADYINSTALLED" />
+ <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Condition="Installed AND NOT PATCH" />
+
+ <ProgressText Action="QtIdpInstall" Message="Performing IdP Installation tasks; this may take some time." />
</UI>
</Fragment>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs
index 77253aa3a..d07bc073e 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-install-dlg.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,14 +10,14 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- This file contains the description of the dialog which captures installation
values for first time installs -->
<Fragment>
<UI>
- <TextStyle Id="JettyWarning_Font" Bold="yes" Red="200" Green="0" Blue="0" Size="8" FaceName="Tahoma"/>
+ <TextStyle Id="JettyWarning_Font" Bold="yes" Red="200" Green="0" Blue="0" Size="8" FaceName="Tahoma" />
<!-- This Dialog sets up:
- INSTALLDIR
@@ -38,8 +37,8 @@
<!-- Where? -->
<Control Id="Dest" Type="Edit" X="25" Y="71" Width="228" Height="17" Property="INSTALLDIR" Text="[INSTALLDIR]" />
<Control Id="ChangeFolder" Type="PushButton" X="265" Y="71" Height="17" Width="56" Text="B&rowse...">
- <Publish Event="SpawnDialog" Value="BrowseDlg" Order="1">1</Publish>
- <Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+ <Publish Event="SpawnDialog" Value="BrowseDlg" Order="1" />
+ <Publish Event="[_BrowseProperty]" Value="[WIXUI_INSTALLDIR]" Order="1" />
</Control>
<!-- AD? -->
@@ -54,23 +53,19 @@
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+ <Publish Event="NewDialog" Value="LicenseAgreementDlg" />
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]">1</Publish>
- <Publish Event="DoAction" Value="WixUIValidatePath">NOT WIXUI_DONTVALIDATEPATH</Publish>
- <Publish Event="SpawnDialog" Value="InvalidDirDlg">NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"</Publish>
- <Publish Event="NewDialog" Value="WarnDlgShib">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE"
- </Publish>
- <Publish Event="NewDialog" Value="ConfigADDlg">
- (WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD="TRUE"
- </Publish>
+ <Publish Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" />
+ <Publish Event="DoAction" Value="WixUIValidatePath_$(sys.BUILDARCHSHORT)" Condition="NOT WIXUI_DONTVALIDATEPATH" />
+ <Publish Event="SpawnDialog" Value="InvalidDirDlg" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"" />
+ <Publish Event="NewDialog" Value="WarnDlgShib" Condition="(WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD <>"TRUE"" />
+ <Publish Event="NewDialog" Value="ConfigADDlg" Condition="(WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1") AND CONFIGURE_AD="TRUE"" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-main.wxs b/idp-msi/src/main/wix/ShibbolethIdP-main.wxs
index c24696b94..21f54270e 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-main.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -13,15 +12,14 @@
<?define UpgradeUUID="8d3bfb53-47ff-4cbc-9363-cbf9e46bedc4"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <Product Id="*" Name="Shibboleth IdP V5" Language="1033" Version="5.0.0.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
- <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="x64" Description="Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+ <Package Name="Shibboleth IdP V5" Language="1033" Version="5.0.0.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)" InstallerVersion="310"><SummaryInformation Description="Shibboleth IdP V5" Manufacturer="The Shibboleth Consortium" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
<MediaTemplate EmbedCab="yes" />
- <Condition Message="C run time libraray not installed">UCRTBASE_DLL</Condition>
- <Condition Message="JDK not installed">JAVA_EXECUTABLE</Condition>
+ <Launch Condition="UCRTBASE_DLL" Message="C run time libraray not installed" />
+ <Launch Condition="JAVA_EXECUTABLE" Message="JDK not installed" />
<!-- Information for the properties page of the msi -->
@@ -37,14 +35,7 @@
<ComponentGroupRef Id="SaveRegistry" />
</Feature>
- <Directory Id="TARGETDIR" Name="SourceDir">
- <Directory Id="CommonAppDataFolder">
- <Directory Id="ProgramDataShib" Name="Shibboleth">
- <Directory Id="IDPDISTDIR" Name="IdP"/>
- </Directory>
- </Directory>
- <Directory Id="INSTALLDIR" Name="shibboleth-idp"/>
- </Directory>
+
<Property Id="JAVA_EXECUTABLE" Secure="yes">
<DirectorySearch Id="JavaBinSearch" Depth="0" Path="[%JAVA_HOME]\bin">
@@ -69,41 +60,41 @@
<Binary Id="WriteConfigFilesSrc" SourceFile="scripts\shib_write_configs.vbs" />
- <CustomAction Id="WriteConfigFiles" BinaryKey="WriteConfigFilesSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="WriteConfigFiles" VBScriptCall="" Execute="deferred" Impersonate="no" BinaryRef="WriteConfigFilesSrc" />
<CustomAction Id="SetWriteConfigFiles" Property="WriteConfigFiles" Value="[INSTALLDIR];@;[DNSNAME];@;[IDP_SCOPE];@;[DEBUG_INSTALL];@;[CONFIGURE_AD];@;[AD_DOMAIN];@;[AD_USER];@;[AD_PASS];@;[AD_USE_GC]" />
<!-- Ant actions set the command line in two parts because of ICE03 -->
- <CustomAction Id="SetIdpInstall1" Property="QtIdpInstall1" Value=""[JAVA_EXECUTABLE]" -cp "[IDPDISTDIR]bin\lib\*;[IDPDISTDIR]webapp\WEB-INF\lib\*" net.shibboleth.idp.installer.impl.IdPInstallerCLI"/>
+ <CustomAction Id="SetIdpInstall1" Property="QtIdpInstall1" Value=""[JAVA_EXECUTABLE]" -cp "[IDPDISTDIR]bin\lib\*;[IDPDISTDIR]webapp\WEB-INF\lib\*" net.shibboleth.idp.installer.impl.IdPInstallerCLI" />
<CustomAction Id="SetIdpInstall2" Property="QtIdpInstall2" Value="--propertyFile "[INSTALLDIR]idp.install.properties" --sourceDir [IDPDISTDIR]" />
<CustomAction Id="SetIdpInstall3" Property="QtIdpInstall" Value="[QtIdpInstall1] [QtIdpInstall2]" />
<CustomAction Id="RunIdpInstall" Directory="ProgramDataShib" ExeCommand="[QtIdpInstall]" Execute="deferred" Impersonate="no" />
- <CustomAction Id="QtIdpInstall" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
+ <CustomAction Id="QtIdpInstall" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" BinaryRef="Wix4UtilCA_X86" />
<InstallUISequence>
<!-- inherit installationDir if there is something to inherit (Conditions set in ShibolethIdP-registry) -->
<Custom Action="SetDefaultInstallDir" After="AppSearch" />
- <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
- <Custom Action="SetInstallDir" After="SetDefaultInstallDir">NOT OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
- <Custom Action="SetDNSName" After="AppSearch">NOT DNSNAME</Custom>
+ <Custom Action="InheritInstallDir" After="AppSearch" Condition="OLD_INSTALLDIR AND NOT INSTALLDIR" />
+ <Custom Action="SetInstallDir" After="SetDefaultInstallDir" Condition="NOT OLD_INSTALLDIR AND NOT INSTALLDIR" />
+ <Custom Action="SetDNSName" After="AppSearch" Condition="NOT DNSNAME" />
</InstallUISequence>
<InstallExecuteSequence>
<!-- Duplicate actions from the UI case - but only for auto 3->3 upgrades -->
- <Custom Action="InheritInstallDir" After="AppSearch">OLD_INSTALLDIR AND NOT INSTALLDIR</Custom>
+ <Custom Action="InheritInstallDir" After="AppSearch" Condition="OLD_INSTALLDIR AND NOT INSTALLDIR" />
<!-- Work -->
- <Custom Action="SetWriteConfigFiles" After="CostFinalize">NOT Installed</Custom>
- <Custom Action="WriteConfigFiles" After="InstallFiles">NOT Installed</Custom>
- <Custom Action="SetIdpInstall1" After="WriteConfigFiles">NOT Installed</Custom>
- <Custom Action="SetIdpInstall2" After="SetIdpInstall1">NOT Installed</Custom>
- <Custom Action="SetIdpInstall3" After="SetIdpInstall2">NOT Installed</Custom>
- <Custom Action="RunIdpInstall" After="SetIdpInstall3">(NOT Installed) AND DEBUG_INSTALL</Custom>
- <Custom Action="QtIdpInstall" After="SetIdpInstall3">(NOT Installed) AND (NOT DEBUG_INSTALL)</Custom>
+ <Custom Action="SetWriteConfigFiles" After="CostFinalize" Condition="NOT Installed" />
+ <Custom Action="WriteConfigFiles" After="InstallFiles" Condition="NOT Installed" />
+ <Custom Action="SetIdpInstall1" After="WriteConfigFiles" Condition="NOT Installed" />
+ <Custom Action="SetIdpInstall2" After="SetIdpInstall1" Condition="NOT Installed" />
+ <Custom Action="SetIdpInstall3" After="SetIdpInstall2" Condition="NOT Installed" />
+ <Custom Action="RunIdpInstall" After="SetIdpInstall3" Condition="(NOT Installed) AND DEBUG_INSTALL" />
+ <Custom Action="QtIdpInstall" After="SetIdpInstall3" Condition="(NOT Installed) AND (NOT DEBUG_INSTALL)" />
</InstallExecuteSequence>
@@ -112,5 +103,12 @@
</Upgrade>
<UIRef Id="ShibbolethInstallDir" />
- </Product>
+
+ <StandardDirectory Id="CommonAppDataFolder">
+ <Directory Id="ProgramDataShib" Name="Shibboleth">
+ <Directory Id="IDPDISTDIR" Name="IdP" />
+ </Directory>
+ </StandardDirectory>
+ <Directory Id="INSTALLDIR" Name="shibboleth-idp" />
+ </Package>
</Wix>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs b/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs
index 52ab49ef5..c46e0b30f 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-registry.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -12,29 +11,29 @@
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- to do with the IdP Registry -->
<?define ServiceName="shibd_idp"?>
<Fragment>
<ComponentGroup Id="SaveRegistry">
- <Component Id="SaveTarget" Guid="{32A39FB0-21E4-475E-891A-C9901D3548A3}" Directory="INSTALLDIR" Win64="no">
+ <Component Id="SaveTarget" Guid="{32A39FB0-21E4-475E-891A-C9901D3548A3}" Directory="INSTALLDIR" Bitness="always32">
<RegistryValue Id="targetReg" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Value="[INSTALLDIR]" Type="string" KeyPath="yes" />
</Component>
<!-- pretty icon for the "install programs" page -->
- <Component Id="shib.ico" Guid="{7F4CE60B-A27B-4E07-8DD9-19F16B008C56}" Directory="INSTALLDIR" Win64="yes">
- <File KeyPath="yes" Source="$(var.ProjectDir)\shib.ico" />
+ <Component Id="shib.ico" Guid="{7F4CE60B-A27B-4E07-8DD9-19F16B008C56}" Directory="INSTALLDIR" Bitness="always64">
+ <File Id="shib.ico" KeyPath="yes" Source="$(var.ProjectDir)\shib.ico" />
<RegistryValue Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]" Name="DisplayIcon" Value="[#shib.ico],0" Type="string" />
</Component>
</ComponentGroup>
<Property Id="OLD_INSTALLDIR" Secure="yes">
- <RegistrySearch Id="OldInstallDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Type="directory" Win64="no" />
+ <RegistrySearch Id="OldInstallDir" Root="HKLM" Key="SOFTWARE\Shibboleth\IdP" Name="InstallDir" Type="directory" Bitness="always32" />
</Property>
<Property Id="JAVA_JVMMX" Secure="yes">
- <RegistrySearch Id="JvmMx" Root="HKLM" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\shibd_idp\Parameters\Java" Name="JvmMx" Type="raw" Win64="no" />
+ <RegistrySearch Id="JvmMx" Root="HKLM" Key="SOFTWARE\Apache Software Foundation\Procrun 2.0\shibd_idp\Parameters\Java" Name="JvmMx" Type="raw" Bitness="always32" />
</Property>
<!-- Should be in Mergemodule -->
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs
index f87dd28a8..402907926 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-update-dlg.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,7 +10,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- The dialog to display if we sense an upgrade -->
<Fragment>
@@ -30,15 +29,15 @@
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
+ <Publish Event="NewDialog" Value="WelcomeDlg" />
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Event="NewDialog" Value="VerifyReadyDlg" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
</UI>
diff --git a/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs b/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs
index 444dc55be..f8f2637b2 100644
--- a/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs
+++ b/idp-msi/src/main/wix/ShibbolethIdP-warn-dlg.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed under the Apache License, Version 2.0 (the "License");
+<!-- Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@@ -11,7 +10,7 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<!-- The dialog to display if we sense a non default installation directory -->
<Fragment>
@@ -33,16 +32,16 @@
<!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="1" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back">
- <Publish Event="NewDialog" Value="ConfigADDlg">CONFIGURE_AD</Publish>
- <Publish Event="NewDialog" Value="InstallDirDlgShib">NOT CONFIGURE_AD</Publish>
+ <Publish Event="NewDialog" Value="ConfigADDlg" Condition="CONFIGURE_AD" />
+ <Publish Event="NewDialog" Value="InstallDirDlgShib" Condition="NOT CONFIGURE_AD" />
</Control>
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&Next" Default="yes">
- <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+ <Publish Event="NewDialog" Value="VerifyReadyDlg" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Text="&Cancel" Cancel="yes">
- <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+ <Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
</UI>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list