[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: MergeModules/Curl-x64.wxs MergeModules/OpenSAML-x64.wxs MergeModules/Xerc...

[noreply at shibboleth.net]

Author: scantor
Date: Fri May 18 22:11:21 2012
New Revision: 3668

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3668&view=rev
Log:
Fixes and cleanups, successful 2.5 build.

Modified:
    branches/REL_2/msi/WiX/MergeModules/Curl-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/OpenSAML-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/ShibbolethSP-defs-x86.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.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=3668&r1=3667&r2=3668&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:11:21 2012
@@ -31,7 +31,7 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.64\libcurl.dll'/>
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>
               </Component>
               <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
@@ -40,7 +40,7 @@
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.64\libcurld.dll'/>
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>
                 </Component>
                 <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
                   <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
@@ -49,7 +49,7 @@
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}'>
+              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}' Win64='yes'>
                 <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
               </Component>
             </Directory><!-- doc -->

Modified: branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs?rev=3668&r1=3667&r2=3668&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/OpenSAML-x64.wxs Fri May 18 22:11:21 2012
@@ -56,7 +56,7 @@
                   <File KeyPath='yes' Checksum='yes'
                     Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
                 </Component>
-              </Directory> <!-- lib_debug -->
+              </Directory><!-- lib_debug -->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='doc' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>
@@ -64,7 +64,7 @@
                 <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />
                 <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />
               </Component>
-            </Directory> <!-- doc -->
+            </Directory><!-- doc -->
           </Directory><!--shibboleth_SP-->
         </Directory><!--shibboleth-->
       </Directory><!--ProgramFiles64Folder-->

Modified: branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs?rev=3668&r1=3667&r2=3668&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Xerces-x64.wxs Fri May 18 22:11:21 2012
@@ -40,7 +40,7 @@
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
-              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}'>
+              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}' Win64='yes'>
                 <File KeyPath='yes' Name='XERCES.LICENSE'

[... 74 lines stripped ...]