Updated for 2.5 fileset plus various cleanups

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-main-x86.wxs

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 9e08c35..71e336a 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -22,21 +22,28 @@
   <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
            Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
-    <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
+    <Package Description='Installer for Shibboleth SP (32-bit only)' 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
+\r
     <PropertyRef Id='SHIB_OLDVERSION'/>\r
 \r
     <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>\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 &quot;Change&quot; 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 64bit msi but specify a 32 bit shibd'>NOT VersionNT64</Condition>\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
 \r
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
 \r
     <?include ShibbolethSP-properties.wxi?>\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
     <!-- Files -->\r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <!-- The test bit -->\r
@@ -49,6 +56,8 @@
         <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />\r
         <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />\r
         <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />\r
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />\r
+        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />\r
         <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
         <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
@@ -73,6 +82,8 @@
       <MergeRef Id='CurlMergeModule_x86'/>\r
       <MergeRef Id='FastCGIMergeModule_x86'/>\r
       <MergeRef Id='Log4ShibMergeModule_x86'/>\r
+      <MergeRef Id='OpenSAMLMergeModule_x86'/>\r
+      <MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
       <MergeRef Id='OpenSSLMergeModule_x86'/>\r
       <MergeRef Id='ShibbolethMergeModule_x86'/>\r
       <MergeRef Id='ShibbolethMergeModule_schemas'/>\r