X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2FWiX%2FShibbolethSP-main-x86.wxs;h=d9850cb249b5d33da1c2bd97c6e0929bcb218750;hb=dc3731db3c5d96742840c34b4d0b96edbcf77349;hp=0148b820eac9d7b16ac8d3d5c39e7566b0cebc48;hpb=d70a1f9082e179dff08a3a866a611bc03b4604f8;p=shibboleth%2Fcpp-sp.git

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 0148b82..d9850cb 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -1,105 +1,104 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
-   Development, Inc. (UCAID) under one or more contributor license
-   agreements.  See the NOTICE file distributed with this work for
-   additional information regarding copyright ownership. The UCAID
-   licenses this file to You under the Apache License, Version 2.0
-   (the 'License'); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
- 
-     http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an 'AS IS' BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied.  See the License for the specific language governing
-   permissions and limitations under the License.  -->
-
-<?include Versions.wxi ?>
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Id='{DB1B7660-87DA-4B83-AF31-0449113298BD}' Language='1033' 
-           Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' 
-           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>
-    <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
-
-    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." 
-                  MigrateFeatures="yes"  Schedule="afterInstallExecute" />
-
-    <PropertyRef Id='SHIB_OLDVERSION'/>
-
-    <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
-    <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
-    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
-
-    <Condition Message='For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults'>NOT VersionNT64</Condition>
-
-    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
-
-    <?include ShibbolethSP-properties.wxi?>
-
-    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
-    <Property Id='IS64BITINSTALL' Value='FALSE'/>
-
-    <UIRef Id='ShibbolethInstallDir'/>
-
-    <!-- Files -->
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <!-- The test bit -->
-      <Directory Id='opt' Name='opt'>
-        <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
-      </Directory>
-
-      <Directory Id='ProgramFilesFolder' Name='PFiles'>
-        <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
-        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />
-        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />
-        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />
-        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />
-        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
-        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
-        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
-        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
-        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
-        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
-        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />
-
-        <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' 
-               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
-        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' 
-               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
-      </Directory><!--ProgramFilesFolder-->
-
-      <Component Id='SetPath' Guid='{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}'>
-        <Environment Id='SetPath' Name='PATH' Action='set' Part='last' System='yes'
-                     Value='[ProgramFilesFolder]Shibboleth\SP\lib' />
-      </Component>
-    </Directory><!--TARGETDIR-->
-
-    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' 
-             ConfigurableDirectory='INSTALLDIR'>
-      <MergeRef Id='CurlMergeModule_x86'/>
-      <MergeRef Id='FastCGIMergeModule_x86'/>
-      <MergeRef Id='Log4ShibMergeModule_x86'/>
-      <MergeRef Id='OpenSAMLMergeModule_x86'/>
-      <MergeRef Id='OpenSAMLMergeModule_schemas'/>
-      <MergeRef Id='OpenSSLMergeModule_x86'/>
-      <MergeRef Id='ShibbolethMergeModule_x86'/>
-      <MergeRef Id='ShibbolethMergeModule_schemas'/>
-      <MergeRef Id='XercesMergeModule_x86'/>
-      <MergeRef Id='XmlSecMergeModule_x86'/>
-      <MergeRef Id='ZlibMergeModule_x86'/>
-
-      <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>
-      <MergeRef Id='Microsoft_VC100_CRT_x86' />
-
-      <!-- ShibbolethSP-main-x86 -->
-      <ComponentRef Id='SetPath'/>
-
-      <?include ShibbolethSP-defs-x86.wxi ?>
-
-    </Feature>
-  </Product>
-</Wix>
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Product Id='$(var.ShibbolethId32)' Language='1033' 
+           Manufacturer='Shibboleth Consortium' Name='Shibboleth Service Provider' 
+           UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion).$(var.ShibbolethPatchVersion)'>
+    <Package Description='Shibboleth SP (x86) V$(var.ShibbolethVersion) Patch Level $(var.ShibbolethPatchVersion)' Compressed='yes'
+           Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
+
+    <MajorUpgrade DowngradeErrorMessage='A later version of [ProductName] is already installed. Setup will now exit.'
+           MigrateFeatures='yes' Schedule='afterInstallExecute' AllowSameVersionUpgrades='yes'/>
+
+    <PropertyRef Id='SHIB_OLDVERSION'/>
+
+    <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT &gt;= 501)</Condition>
+    <Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>
+    <Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the &quot;Change&quot; option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>
+
+    <Condition Message='For a 32-bit installation on a 64-bit architecture, install the 64-bit MSI but specify 32-bit defaults'>NOT VersionNT64</Condition>
+
+    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
+
+    <?include ShibbolethSP-properties.wxi?>
+
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
+    <Property Id='IS64BITINSTALL' Value='FALSE'/>
+    <Property Id='INSTALL_32BIT' Secure='yes' Value='TRUE' />
+
+    <UIRef Id='ShibbolethInstallDir'/>
+
+    <!-- Files -->
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <!-- The test bit -->
+      <Directory Id='opt' Name='opt'>
+        <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>
+      </Directory>
+
+      <Directory Id='ProgramFilesFolder' Name='PFiles'>
+        <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
+        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
+        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
+        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
+
+        <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />
+        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' 
+               SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />
+      </Directory><!--ProgramFilesFolder-->
+
+      <Component Id='SetPath' Guid='{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}'>
+        <Environment Id='SetPath' Name='PATH' Action='set' Part='last' System='yes'
+                     Value='[ProgramFilesFolder]Shibboleth\SP\lib' />
+      </Component>
+    </Directory><!--TARGETDIR-->
+
+    <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' 
+             ConfigurableDirectory='INSTALLDIR'>
+      <MergeRef Id='CurlMergeModule_x86'/>
+      <MergeRef Id='FastCGIMergeModule_x86'/>
+      <MergeRef Id='Log4ShibMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_x86'/>
+      <MergeRef Id='OpenSAMLMergeModule_schemas'/>
+      <MergeRef Id='OpenSSLMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_x86'/>
+      <MergeRef Id='ShibbolethMergeModule_schemas'/>
+      <MergeRef Id='XercesMergeModule_x86'/>
+      <MergeRef Id='XmlSecMergeModule_x86'/>
+      <MergeRef Id='ZlibMergeModule_x86'/>
+
+      <MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>
+      <MergeRef Id='Microsoft_VC100_CRT_x86' />
+
+      <!-- ShibbolethSP-main-x86 -->
+      <ComponentRef Id='SetPath'/>
+
+      <?include ShibbolethSP-defs-x86.wxi ?>
+
+    </Feature>
+  </Product>
+</Wix>