projects / shibboleth / sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 e47afb5..78084e2 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -19,11 +19,14 @@
 <?include Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
+  <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' 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='405' Platform='x64'/>\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
@@ -36,10 +39,15 @@
 \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="Shib_InstallDir"/>\r
+\r
+\r
     <!-- 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 +57,12 @@
         <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='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-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
@@ -72,7 +81,6 @@
         <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
@@ -80,18 +88,38 @@
         <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
-    <Feature Id='Shibboleth' Title='Shibboleth' Level='1'>\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
+      <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
+    <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='XmlToolingMergeModule_x86'/>\r
       <MergeRef Id='ZlibMergeModule_x86'/>\r
 \r
       <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>\r
@@ -105,7 +133,6 @@
       <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
@@ -119,81 +146,41 @@
       <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
       <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
-\r
-      <!-- ShibbolethSP-exe-x64-->\r
+      <!-- ShibbolethSP-main-x64 -->\r
+      <ComponentRef Id='SetPath'/>\r
+      <ComponentRef Id='SetPath64'/>\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
+      <ComponentRef Id='SetService64' />\r
+      <ComponentRef Id='SetService32' />\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
Shibboleth SP