[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:10:59 2012
New Revision: 3667

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3667&view=rev
Log:
Updated for 2.5 fileset plus various cleanups

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/Zlib-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Zlib-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/tes.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-shibd-dialog.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=3667&r1=3666&r2=3667&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Fri May 18 22:10:59 2012
@@ -130,10 +130,16 @@
 /msi/*.msi
 /msi/compile.log
 
+# /msi/WiX
+/msi/WiX/*.wixobj
+/msi/WiX/*.wixpdb
+/msi/WiX/*.msi
+
 # /msi/WiX/MergeModules
 /msi/WiX/MergeModules/*.wixobj
 /msi/WiX/MergeModules/*.wixpdb
 /msi/WiX/MergeModules/*.msm
+/msi/Wix/MergeModules/*.msi
 
 # /nsapi_shib/
 /nsapi_shib/*.plg

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=3667&r1=3666&r2=3667&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:10:59 2012
@@ -30,20 +30,20 @@
           <Directory Id='shibboleth_sp' Name='SP'>
             <Directory Id='lib' Name='lib'>
               <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>
-                <File KeyPath='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.64\libcurl.dll'/>
               </Component>
               <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
-                <File KeyPath='yes' 
+                <File KeyPath='yes' Checksum='yes'
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release.x64\curl.exe'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>
-                  <File KeyPath='yes' 
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.64\libcurld.dll'/>
                 </Component>
                 <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
-                  <File Id='curl.exe_debug' KeyPath='yes' 
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>
                 </Component>
               </Directory><!-- lib_debug-->

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=3667&r1=3666&r2=3667&view=diff

[... 2448 lines stripped ...]