[cpp-sp COMMIT] in /branches/REL_2/msi/WiX/MergeModules: Curl-x64.wxs Curl-x64.wxs~ Curl-x86.wxs FastCGI-x64.wxs Fast...

[noreply at shibboleth.net]

Author: rdw
Date: Wed May  2 15:29:25 2012
New Revision: 3637

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3637&view=rev
Log:
More work on x64 bit merge modules.  More work needed around the commo schemas

Added:
    branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x64-files.wxs~
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x86-files.wxs~
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/Zlib-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x64.wxs~
    branches/REL_2/msi/WiX/MergeModules/te2.wxs
    branches/REL_2/msi/WiX/MergeModules/te2.wxs~
    branches/REL_2/msi/WiX/MergeModules/tes.wxs
    branches/REL_2/msi/WiX/MergeModules/tes.wxs~
Modified:
    branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Xerces-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-schemas.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x86.wxs

Modified: branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs?rev=3637&r1=3636&r2=3637&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Wed May  2 15:29:25 2012
@@ -21,12 +21,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
-    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL'
+    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>

Modified: branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs?rev=3637&r1=3636&r2=3637&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs Wed May  2 15:29:25 2012
@@ -21,12 +21,9 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
-    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI'
+    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>
-
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  
-         At a a later date, we may chose to make this a placed module  -->
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
@@ -45,12 +42,10 @@
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->

[... 671 lines stripped ...]