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

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 18 22:09:05 2012
New Revision: 3662

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3662&view=rev
Log:
Cleanups and adjustments

Removed:
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxi
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-x86.wxi
Modified:
    branches/REL_2/.gitignore
    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-schemas.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/compile.bat
    branches/REL_2/msi/WiX/MergeModules/tes.wxs
    branches/REL_2/msi/WiX/Versions.wxi

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3662&r1=3661&r2=3662&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Fri May 18 22:09:05 2012
@@ -130,6 +130,11 @@
 /msi/*.msi
 /msi/compile.log
 
+# /msi/WiX/MergeModules
+/msi/WiX/MergeModules/*.wixobj
+/msi/WiX/MergeModules/*.wixpdb
+/msi/WiX/MergeModules/*.msm
+
 # /nsapi_shib/
 /nsapi_shib/*.plg
 /nsapi_shib/Release

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=3662&r1=3661&r2=3662&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs Fri May 18 22:09:05 2012
@@ -48,6 +48,11 @@
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->

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=3662&r1=3661&r2=3662&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Fri May 18 22:09:05 2012
@@ -29,7 +29,6 @@
         <Directory Id='shibboleth' Name='Shibboleth'>
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
-
               <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
                 <File KeyPath='yes' 
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>
@@ -43,12 +42,17 @@
                   <File KeyPath='yes' 
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
                 </Component>
-                <Component Id='curl.exe1' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
+                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
                   <File Id='curl.exe_debug' KeyPath='yes' 
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
         </Directory><!-- shibboleth -->
       </Directory><!-- ProgramFilesFolder -->

Modified: branches/REL_2/msi/WiX/MergeModules/FastCGI-x64.wxs

[... 910 lines stripped ...]