Adjust for final release

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

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index d54e803..89a8af3 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -20,13 +20,13 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' 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' Platform='x64'/>\r
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion)' Compressed='yes'\r
+           Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\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_64'/>\r
     <PropertyRef Id='SHIB_OLDVERSION'/>\r
@@ -41,6 +41,7 @@
 \r
     <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\r
     <Property Id='IS64BITINSTALL' Value='TRUE'/>\r
+    <Property Id='INSTALL_32BIT' Secure='yes' />\r
     <UIRef Id='ShibbolethInstallDir'/>\r
 \r
 \r
@@ -152,6 +153,7 @@
       <ComponentRef Id='mod_shib_2464.so'/>\r
       <ComponentRef Id='odbc_store64.so'/>\r
       <ComponentRef Id='plugins64.so'/>\r
+      <ComponentRef Id='plugins_lite64.so'/>\r
       <ComponentRef Id='shibauthorizer64.exe'/>\r
       <ComponentRef Id='shibresponder64.exe'/>\r
 \r
@@ -162,6 +164,7 @@
       <ComponentRef Id='mod_shib_2464.so_debug'/>\r
       <ComponentRef Id='odbc_store64.so_debug'/>\r
       <ComponentRef Id='plugins64.so_debug'/>\r
+      <ComponentRef Id='plugins_lite64.so_debug'/>\r
       <ComponentRef Id='shibauthorizer64.exe_debug'/>\r
       <ComponentRef Id='shibresponder64.exe_debug'/>\r
 \r
@@ -169,7 +172,9 @@
       <ComponentRef Id='shibd64.exe_debug'/>\r
 \r
       <!-- ShibbolethSP-registry-x64 -->\r
-\r
+      <ComponentRef Id='TargetDir64'/>\r
+      <ComponentRef Id='InstallIsapi64'/>\r
+      <ComponentRef Id='Install32Bit64'/>\r
       <ComponentRef Id='file_extension64'/>\r
       <ComponentRef Id='shib64.ico' />\r
 \r