projects / shibboleth / cpp-sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove the option of not installing shibd_default
[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..001dfb0 100644 (file)
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -20,11 +20,14 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' Language='1033' \r
-           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' \r
            UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
-    <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
+    <Package Description='Shibboleth SP (x86 and x64) V$(var.ShibbolethVersion) Beta 1' 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
@@ -36,6 +39,11 @@
 \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
@@ -49,16 +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' \r
-               SourceFile='MergeModules\OpenSAML-schemas.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='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
@@ -77,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
@@ -95,13 +98,18 @@
         <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
-    <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->\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' \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
@@ -112,8 +120,6 @@
       <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
@@ -127,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
@@ -141,26 +146,34 @@
       <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='plugins_lite64.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='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='shibdD64.exe'/>\r
+      <ComponentRef Id='shibd64.exe_debug'/>\r
 \r
       <!-- ShibbolethSP-registry-x64 -->\r
-\r
+      <ComponentRef Id='TargetDir64'/>\r
+      <ComponentRef Id='InstallIsapi64'/>\r
+      <ComponentRef Id='Install32Bit64'/>\r
       <ComponentRef Id='file_extension64'/>\r
       <ComponentRef Id='shib64.ico' />\r
 \r
@@ -168,6 +181,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
Unnamed repository; edit this file 'description' to name the repository.