More work on making the x64 installer work. TODOs added. X86 install clean compiles

[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 e47afb5..fa43875 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -39,7 +39,7 @@
     <!-- Files -->\r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <!-- The test bit -->\r
-      <Directory Id='OPT' Name='opt'>\r
+      <Directory Id='opt' Name='opt'>\r
         <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>\r
       </Directory>\r
 \r
@@ -49,11 +49,15 @@
         <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='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
@@ -80,18 +84,34 @@
         <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
+\r
     </Directory><!--TARGETDIR-->\r
 \r
-    <Feature Id='Shibboleth' Title='Shibboleth' Level='1'>\r
+    <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->\r
+\r
+    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' \r
+             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='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
@@ -142,58 +162,11 @@
       <ComponentRef Id='file_extension64'/>\r
       <ComponentRef Id='shib64.ico' />\r
 \r
-      <!-- ShibbolethSP-noarch-x64 -->\r
-\r
-      <ComponentRef Id='doc_shibboleth'/>\r
-      <ComponentRef Id='etc_shibboleth_perm'/>\r
-      <ComponentRef Id='etc_shibboleth_nonperm'/>\r
-      <ComponentRef Id='dist_noperm'/>\r
-      <ComponentRef Id='accessError.html'/>\r
-      <ComponentRef Id='apache.config'/>\r
-      <ComponentRef Id='apache2.config'/>\r
-      <ComponentRef Id='metadataError.html'/>\r
-      <ComponentRef Id='native.logger'/>\r
-      <ComponentRef Id='sessionError.html'/>\r
-      <ComponentRef Id='shibd.logger'/>\r
-      <ComponentRef Id='var_log_shibboleth_folder'/>\r
-      <ComponentRef Id='share_xml_shibboleth'/>\r
-      <ComponentRef Id='share_xml_shibboleth_xsd'/>\r
+      <!-- ShibbolethSP-main-x64 -->\r
+      <ComponentRef Id='SetPath'/>\r
+      <ComponentRef Id='SetPath64'/>\r
 \r
-      <!-- ShibbolethSP-exe-x64-->\r
-\r
-      <ComponentRef Id='resolvertest.exe'/>\r
-      <ComponentRef Id='mdquery.exe'/>\r
-      <ComponentRef Id='resolvertest.exe_debug'/>\r
-      <ComponentRef Id='mdquery.exe_debug'/>\r
-\r
-      <ComponentRef Id='adfs.so'/>\r
-      <ComponentRef Id='adfslite.so'/>\r
-      <ComponentRef Id='isapi_shib.dll'/>\r
-      <ComponentRef Id='mod_shib_13.so'/>\r
-      <ComponentRef Id='mod_shib_20.so'/>\r
-      <ComponentRef Id='mod_shib_22.so'/>\r
-      <ComponentRef Id='nsapi_shib.dll'/>\r
-      <ComponentRef Id='odbcstore.so'/>\r
-      <ComponentRef Id='shibauthorizer.exe'/>\r
-      <ComponentRef Id='shibresponder.exe'/>\r
-\r
-      <ComponentRef Id='adfsD.so'/>\r
-      <ComponentRef Id='adfsliteD.so'/>\r
-      <ComponentRef Id='isapi_shibD.dll'/>\r
-      <ComponentRef Id='mod_shib_13D.so'/>\r
-      <ComponentRef Id='mod_shib_20D.so'/>\r
-      <ComponentRef Id='mod_shib_22D.so'/>\r
-      <ComponentRef Id='nsapi_shibD.dll'/>\r
-      <ComponentRef Id='odbcstoreD.so'/>\r
-      <ComponentRef Id='shibauthorizerD.exe'/>\r
-      <ComponentRef Id='shibresponderD.exe'/>\r
-\r
-      <ComponentRef Id='shibd.exe'/>\r
-      <ComponentRef Id='shibdD.exe'/>\r
-\r
-      <!-- ShibbolethSP-registry-x64 -->\r
-      <ComponentRef Id='file_extension'/>\r
-      <ComponentRef Id='shib.ico' />\r
+      <?include ShibbolethSP-defs-x86.wxi ?>\r
 \r
     </Feature>\r
   </Product>\r