SSPCPP-452 (add scripts to swap architecture of shibd). Also fix bug whereby we...

[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 1164ceb..20976b8 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -48,17 +48,11 @@
         <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' \r
-               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='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_schemas' Language='1033' \r
-               SourceFile='MergeModules\XmlTooling-schemas.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
@@ -72,12 +66,10 @@
         <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='XmlToolingMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlTooling-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
@@ -98,6 +90,15 @@
 \r
     </Directory><!--TARGETDIR-->\r
 \r
+    <DirectoryRef Id='etc_shibboleth' FileSource='$(var.BuildDirectory)\cvs\2.0\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
+      <Component Id='SetService32' Guid='{3332A486-845E-4EE4-975F-3D75757EB941}' Permanent='yes'>\r
+        <File KeyPath='yes' Name='SetService32.bat' />\r
+      </Component>\r
+    </DirectoryRef><!-- etc_shibboleth -->\r
+\r
     <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->\r
 \r
     <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' \r
@@ -105,15 +106,11 @@
       <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='XmlToolingMergeModule_x86'/>\r
-      <MergeRef Id='XmlToolingMergeModule_schemas'/>\r
       <MergeRef Id='ZlibMergeModule_x86'/>\r
 \r
       <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>\r
@@ -122,12 +119,10 @@
       <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='XmlToolingMergeModule_x64'/>\r
       <MergeRef Id='ZlibMergeModule_x64'/>\r
 \r
       <MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>\r
@@ -168,6 +163,9 @@
       <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