From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 11 Mar 2015 21:37:20 +0000 (+0000)
Subject: Change path to Xerces library files
X-Git-Tag: 2.5.4~4
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=ba82f9bac6adf708283ffd94c99105cea42fae63

Change path to Xerces library files
---

diff --git a/msi/WiX/MergeModules/Xerces-x64.wxs b/msi/WiX/MergeModules/Xerces-x64.wxs
index fac8273..0824d4b 100644
--- a/msi/WiX/MergeModules/Xerces-x64.wxs
+++ b/msi/WiX/MergeModules/Xerces-x64.wxs
@@ -28,19 +28,19 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='$(var.Xerces64Component)' Win64='yes'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\VC10\Release\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win64\VC10\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}' Win64='yes'>
                 <File KeyPath='yes' Name='XERCES.LICENSE'
-                    Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\LICENSE' />
+                    Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\LICENSE' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->
diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index 9c12af6..6c0672d 100644
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -28,19 +28,19 @@
             <Directory Id='lib' Name='lib'>
               <Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>
                 <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\VC10\Release\xerces-c_$(var.XercesFileVersion).dll'/>
               </Component>
               <Directory Id='lib_debug' Name='debug'>
                 <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
                   <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\Build\Win32\VC10\Debug\xerces-c_$(var.XercesFileVersion)D.dll'/>
                 </Component>
               </Directory><!-- lib_debug-->
             </Directory><!-- lib -->
             <Directory Id='doc' Name='doc'>
               <Component Id='XERCES.LICENSE' Guid='{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}'>
                 <File KeyPath='yes' Name='XERCES.LICENSE'
-                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\LICENSE' />
+                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)\LICENSE' />
               </Component>
             </Directory><!-- doc -->
           </Directory><!-- shibboleth_SP -->