Adjust for final release

[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 4921d6b..3f8d422 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -20,13 +20,13 @@
 \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 (x86 and x64)' Compressed='yes'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
+    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion)' 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
+           MigrateFeatures='yes' Schedule='afterInstallExecute' />\r
 \r
     <PropertyRef Id='SHIB_OLDVERSION'/>\r
 \r
@@ -34,13 +34,17 @@
     <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-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
     <?include ShibbolethSP-properties.wxi?>\r
 \r
-    <?include ShibbolethSP-gui.wxi ?>\r
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
+    <Property Id='IS64BITINSTALL' Value='FALSE'/>\r
+    <Property Id='INSTALL_32BIT' Secure='yes' Value='TRUE' />\r
+\r
+    <UIRef Id='ShibbolethInstallDir'/>\r
 \r
     <!-- Files -->\r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
@@ -54,6 +58,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
@@ -78,6 +84,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