Finish adding patch level to package versions and strings
[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-main-x64.wxs
index 16e3de6..e2cbb2b 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='{0F65D86B-3F47-41DC-9CEC-E20538849A6C}' 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
-             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
-\r
-    <PropertyRef Id='SHIB_OLDVERSION_64'/>\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") AND (SHIB_OLDVERSION_64 = "none")</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='TRUE'/>\r
-    <UIRef Id='ShibbolethInstallDir'/>\r
-\r
-\r
-    <!-- Files -->\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <!-- The test bit -->\r
-      <Directory Id='opt' Name='opt'>\r
-        <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>\r
-      </Directory>\r
-\r
-      <Directory Id='ProgramFilesFolder' Name='PFiles'>\r
-        <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->\r
-        <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
-        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
-        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />\r
-\r
-        <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' \r
-               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />\r
-        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' \r
-               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />\r
-      </Directory><!--ProgramFilesFolder-->\r
-\r
-      <Directory Id='ProgramFiles64Folder' Name='PFiles'>\r
-        <!-- 64 bit merge modules notionally go to "Program Files" -->\r
-        <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />\r
-        <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />\r
-        <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />\r
-        <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />\r
-        <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />\r
-        <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />\r
-        <Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />\r
-        <Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />\r
-\r
-        <Merge Id='Microsoft_VC100_DebugCRT_x64' Language='1033' \r
-               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm' DiskId='1' />\r
-        <Merge Id='Microsoft_VC100_CRT_x64' Language='1033' \r
-               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x64.msm' DiskId='1' />\r
-      </Directory><!--ProgramFiles64Folder-->\r
-\r
-      <!-- PATH -->\r
-      <Component Id='SetPath64' Guid='{D3BF9EF4-843A-4D48-BC6C-DC24B063FC35}' Win64='yes'>\r
-        <Environment Id='SetPath64' Name='PATH' Action='set' Part='last' System='yes'\r
-                     Value='[ProgramFiles64Folder]Shibboleth\SP\lib' />\r
-      </Component>\r
-      <Component Id='SetPath' Guid='{0E8BD571-3A26-4F61-979E-B5807A28634A}'>\r
-        <Environment Id='SetPath' Name='PATH' Action='set' Part='last'  System='yes'\r
-                     Value='[ProgramFilesFolder]Shibboleth\SP\lib' />\r
-      </Component>\r
-    </Directory><!--TARGETDIR-->\r
-\r
-    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
-      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}'>\r
-        <File KeyPath='yes' Name='SetService64.bat' />\r
-      </Component>\r
-      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}'>\r
-        <File KeyPath='yes' Name='SetService32.bat' />\r
-      </Component>\r
-    </DirectoryRef><!-- etc_shibboleth -->\r
-\r
-    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' ConfigurableDirectory='INSTALLDIR'>\r
-      <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
-      <MergeRef Id='XercesMergeModule_x86'/>\r
-      <MergeRef Id='XmlSecMergeModule_x86'/>\r
-      <MergeRef Id='ZlibMergeModule_x86'/>\r
-\r
-      <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>\r
-      <MergeRef Id='Microsoft_VC100_CRT_x86' />\r
-\r
-      <MergeRef Id='CurlMergeModule_x64'/>\r
-      <MergeRef Id='FastCGIMergeModule_x64'/>\r
-      <MergeRef Id='Log4ShibMergeModule_x64'/>\r
-      <MergeRef Id='OpenSAMLMergeModule_x64'/>\r
-      <MergeRef Id='OpenSSLMergeModule_x64'/>\r
-      <MergeRef Id='ShibbolethMergeModule_x64'/>\r
-      <MergeRef Id='XercesMergeModule_x64'/>\r
-      <MergeRef Id='XmlSecMergeModule_x64'/>\r
-      <MergeRef Id='ZlibMergeModule_x64'/>\r
-\r
-      <MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>\r
-      <MergeRef Id='Microsoft_VC100_CRT_x64' />\r
-\r
-      <!-- ShibbolethSP-exe-x64-->\r
-\r
-      <ComponentRef Id='resolvertest64.exe'/>\r
-      <ComponentRef Id='mdquery64.exe'/>\r
-      <ComponentRef Id='resolvertest64.exe_debug'/>\r
-      <ComponentRef Id='mdquery64.exe_debug' />\r
-\r
-      <ComponentRef Id='adfs64.so'/>\r
-      <ComponentRef Id='adfs_lite64.so'/>\r
-      <ComponentRef Id='isapi_shib64.dll'/>\r
-      <ComponentRef Id='mod_shib_2264.so'/>\r
-      <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
-      <ComponentRef Id='adfs64.so_debug'/>\r
-      <ComponentRef Id='adfs_lite64.so_debug'/>\r
-      <ComponentRef Id='isapi_shib64.dll_debug'/>\r
-      <ComponentRef Id='mod_shib_2264.so_debug'/>\r
-      <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
-      <ComponentRef Id='shibd64.exe'/>\r
-      <ComponentRef Id='shibd64.exe_debug'/>\r
-\r
-      <!-- ShibbolethSP-registry-x64 -->\r
-\r
-      <ComponentRef Id='file_extension64'/>\r
-      <ComponentRef Id='shib64.ico' />\r
-\r
-      <!-- ShibbolethSP-main-x64 -->\r
-      <ComponentRef Id='SetPath'/>\r
-      <ComponentRef Id='SetPath64'/>\r
-\r
-      <ComponentRef Id='SetService64' />\r
-      <ComponentRef Id='SetService32' />\r
-\r
-      <?include ShibbolethSP-defs-x86.wxi ?>\r
-\r
-    </Feature>\r
-  </Product>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You 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
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='$(var.ShibbolethId64)' Language='1033' 
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
+           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)' Compressed='yes'
+           Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
+           MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes' />
+
+    <PropertyRef Id='SHIB_OLDVERSION_64'/>
+    <PropertyRef Id='SHIB_OLDVERSION'/>
+
+    <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
+    <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
+    <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") AND (SHIB_OLDVERSION_64 = "none")</Condition>
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+
+    <?include ShibbolethSP-properties.wxi?>
+
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
+    <Property Id='IS64BITINSTALL' Value='TRUE'/>
+    <Property Id='INSTALL_32BIT' Secure='yes' />
+    <UIRef Id='ShibbolethInstallDir'/>
+
+
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <!-- The test bit -->
+      <Directory Id='opt' Name='opt'>
+        <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
+      </Directory>
+
+      <Directory Id='ProgramFilesFolder' Name='PFiles'>
+        <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
+        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
+        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
+        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
+
+        <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
+        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+      </Directory><!--ProgramFilesFolder-->
+
+      <Directory Id='ProgramFiles64Folder' Name='PFiles'>
+        <!-- 64 bit merge modules notionally go to "Program Files" -->
+        <Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
+        <Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />
+        <Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />
+
+        <Merge Id='Microsoft_VC100_DebugCRT_x64' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm' DiskId='1' />
+        <Merge Id='Microsoft_VC100_CRT_x64' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x64.msm' DiskId='1' />
+      </Directory><!--ProgramFiles64Folder-->
+
+      <!-- PATH -->
+      <Component Id='SetPath64' Guid='{D3BF9EF4-843A-4D48-BC6C-DC24B063FC35}' Win64='yes'>
+        <Environment Id='SetPath64' Name='PATH' Action='set' Part='last' System='yes'
+                     Value='[ProgramFiles64Folder]Shibboleth\SP\lib' />
+      </Component>
+      <Component Id='SetPath' Guid='{0E8BD571-3A26-4F61-979E-B5807A28634A}'>
+        <Environment Id='SetPath' Name='PATH' Action='set' Part='last'  System='yes'
+                     Value='[ProgramFilesFolder]Shibboleth\SP\lib' />
+      </Component>
+    </Directory><!--TARGETDIR-->
+
+    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
+      <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}'>
+        <File KeyPath='yes' Name='SetService64.bat' />
+      </Component>
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}'>
+        <File KeyPath='yes' Name='SetService32.bat' />
+      </Component>
+    </DirectoryRef><!-- etc_shibboleth -->
+
+    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' ConfigurableDirectory='INSTALLDIR'>
+      <MergeRef Id='CurlMergeModule_x86'/>
+      <MergeRef Id='FastCGIMergeModule_x86'/>
+      <MergeRef Id='Log4ShibMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_schemas'/>
+      <MergeRef Id='OpenSSLMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_schemas'/>
+      <MergeRef Id='XercesMergeModule_x86'/>
+      <MergeRef Id='XmlSecMergeModule_x86'/>
+      <MergeRef Id='ZlibMergeModule_x86'/>
+
+      <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>
+      <MergeRef Id='Microsoft_VC100_CRT_x86' />
+
+      <MergeRef Id='CurlMergeModule_x64'/>
+      <MergeRef Id='FastCGIMergeModule_x64'/>
+      <MergeRef Id='Log4ShibMergeModule_x64'/>
+      <MergeRef Id='OpenSAMLMergeModule_x64'/>
+      <MergeRef Id='OpenSSLMergeModule_x64'/>
+      <MergeRef Id='ShibbolethMergeModule_x64'/>
+      <MergeRef Id='XercesMergeModule_x64'/>
+      <MergeRef Id='XmlSecMergeModule_x64'/>
+      <MergeRef Id='ZlibMergeModule_x64'/>
+
+      <MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>
+      <MergeRef Id='Microsoft_VC100_CRT_x64' />
+
+      <!-- ShibbolethSP-exe-x64-->
+
+      <ComponentRef Id='resolvertest64.exe'/>
+      <ComponentRef Id='mdquery64.exe'/>
+      <ComponentRef Id='resolvertest64.exe_debug'/>
+      <ComponentRef Id='mdquery64.exe_debug' />
+
+      <ComponentRef Id='adfs64.so'/>
+      <ComponentRef Id='adfs_lite64.so'/>
+      <ComponentRef Id='isapi_shib64.dll'/>
+      <ComponentRef Id='mod_shib_2264.so'/>
+      <ComponentRef Id='mod_shib_2464.so'/>
+      <ComponentRef Id='odbc_store64.so'/>
+      <ComponentRef Id='plugins64.so'/>
+      <ComponentRef Id='plugins_lite64.so'/>
+      <ComponentRef Id='shibauthorizer64.exe'/>
+      <ComponentRef Id='shibresponder64.exe'/>
+
+      <ComponentRef Id='adfs64.so_debug'/>
+      <ComponentRef Id='adfs_lite64.so_debug'/>
+      <ComponentRef Id='isapi_shib64.dll_debug'/>
+      <ComponentRef Id='mod_shib_2264.so_debug'/>
+      <ComponentRef Id='mod_shib_2464.so_debug'/>
+      <ComponentRef Id='odbc_store64.so_debug'/>
+      <ComponentRef Id='plugins64.so_debug'/>
+      <ComponentRef Id='plugins_lite64.so_debug'/>
+      <ComponentRef Id='shibauthorizer64.exe_debug'/>
+      <ComponentRef Id='shibresponder64.exe_debug'/>
+
+      <ComponentRef Id='shibd64.exe'/>
+      <ComponentRef Id='shibd64.exe_debug'/>
+
+      <!-- ShibbolethSP-registry-x64 -->
+      <ComponentRef Id='TargetDir64'/>
+      <ComponentRef Id='InstallIsapi64'/>
+      <ComponentRef Id='Install32Bit64'/>
+      <ComponentRef Id='file_extension64'/>
+      <ComponentRef Id='shib64.ico' />
+
+      <!-- ShibbolethSP-main-x64 -->
+      <ComponentRef Id='SetPath'/>
+      <ComponentRef Id='SetPath64'/>
+
+      <ComponentRef Id='SetService64' />
+      <ComponentRef Id='SetService32' />
+
+      <?include ShibbolethSP-defs-x86.wxi ?>
+
+    </Feature>
+  </Product>
+</Wix>