Updated for 2.5 fileset plus various cleanups

[shibboleth/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 7377aaf..78084e2 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -37,7 +37,6 @@
 \r
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
 \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
@@ -57,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
@@ -75,6 +76,7 @@
         <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
@@ -96,10 +98,9 @@
         <Environment Id='SetPath' Name='PATH' Action='set' Part='last'  System='yes'\r
                      Value='[ProgramFilesFolder]Shibboleth\SP\lib' />\r
       </Component>\r
-\r
     </Directory><!--TARGETDIR-->\r
 \r
-    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs'>\r
+    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
       <Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>\r
         <File KeyPath='yes' Name='SetService64.bat' />\r
       </Component>\r
@@ -108,11 +109,12 @@
       </Component>\r
     </DirectoryRef><!-- etc_shibboleth -->\r
 \r
-    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' \r
-             ConfigurableDirectory='INSTALLDIR'>\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
@@ -126,6 +128,7 @@
       <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
@@ -143,23 +146,27 @@
       <ComponentRef Id='mdquery64.exe_debug' />\r
 \r
       <ComponentRef Id='adfs64.so'/>\r
-      <ComponentRef Id='adfslite64.so'/>\r
+      <ComponentRef Id='adfs_lite64.so'/>\r
       <ComponentRef Id='isapi_shib64.dll'/>\r
       <ComponentRef Id='mod_shib_2264.so'/>\r
-      <ComponentRef Id='odbcstore64.so'/>\r
+      <ComponentRef Id='mod_shib_2464.so'/>\r
+      <ComponentRef Id='odbc_store64.so'/>\r
+      <ComponentRef Id='plugins64.so'/>\r
       <ComponentRef Id='shibauthorizer64.exe'/>\r
       <ComponentRef Id='shibresponder64.exe'/>\r
 \r
-      <ComponentRef Id='adfsD64.so'/>\r
-      <ComponentRef Id='adfsliteD64.so'/>\r
-      <ComponentRef Id='isapi_shibD64.dll'/>\r
-      <ComponentRef Id='mod_shib_22D64.so'/>\r
-      <ComponentRef Id='odbcstoreD64.so'/>\r
-      <ComponentRef Id='shibauthorizerD64.exe'/>\r
-      <ComponentRef Id='shibresponderD64.exe'/>\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='shibauthorizer64.exe_debug'/>\r
+      <ComponentRef Id='shibresponder64.exe_debug'/>\r
 \r
       <ComponentRef Id='shibd64.exe'/>\r
-      <ComponentRef Id='shibdD64.exe'/>\r
+      <ComponentRef Id='shibd64.exe_debug'/>\r
 \r
       <!-- ShibbolethSP-registry-x64 -->\r
 \r