\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
- Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
+ Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
- <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
+ <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) RC 1' Compressed='yes'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
\r
- <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." \r
- MigrateFeatures="yes" Schedule="afterInstallExecute" />\r
+ <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'\r
+ AllowSameVersionUpgrades='yes' MigrateFeatures='yes' Schedule='afterInstallExecute' />\r
\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
\r
<Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>\r
<Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>\r
\r
- <Condition Message='For a 32 installation on a 64 architecture, install the 64-bit MSI but specify the 32-bit Service'>NOT VersionNT64</Condition>\r
+ <Condition Message='For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults'>NOT VersionNT64</Condition>\r
\r
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
\r
\r
<!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
<Property Id='IS64BITINSTALL' Value='FALSE'/>\r
- <UIRef Id="Shib_InstallDir"/>\r
+\r
+ <UIRef Id='ShibbolethInstallDir'/>\r
\r
<!-- Files -->\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r