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

[noreply at shibboleth.net]

Author: rdw
Date: Tue May  8 16:06:28 2012
New Revision: 3648

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3648&view=rev
Log:
Move editing for config.xml into the merge modules.  Add a Shibboleth-schemas merge modules.  Split several multi-file components up

Modified:
    branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Log4Shib-x64.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-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSSL-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Xerces-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlSec-x64.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-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/XmlTooling-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/compile.bat
    branches/REL_2/msi/WiX/MergeModules/te2.wxs
    branches/REL_2/msi/WiX/MergeModules/tes.wxs

Modified: branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs?rev=3648&r1=3647&r2=3648&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs Tue May  8 16:06:28 2012
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
     <Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>

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=3648&r1=3647&r2=3648&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Tue May  8 16:06:28 2012
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
     <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='400'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>

Modified: branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs?rev=3648&r1=3647&r2=3648&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs Tue May  8 16:06:28 2012
@@ -22,7 +22,7 @@
   <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>
     <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFiles64Folder' 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=3648&r1=3647&r2=3648&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/FastCGI-x86.wxs Tue May  8 16:06:28 2012
@@ -22,7 +22,7 @@

[... 641 lines stripped ...]