Updated for 2.5 fileset plus various cleanups

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Xerces-x86.wxs

diff --git a/msi/WiX/MergeModules/Xerces-x86.wxs b/msi/WiX/MergeModules/Xerces-x86.wxs
index a4928d4..5807820 100644 (file)
--- a/msi/WiX/MergeModules/Xerces-x86.wxs
+++ b/msi/WiX/MergeModules/Xerces-x86.wxs
@@ -16,40 +16,38 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define XercesVersion='3.1.1' ?>\r
-<?define XercesFileVersion='3_1' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r
-    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces'\r
+    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
-\r
-    <!-- For now just install this where it is put we expect to go into lib and lib\debug below.  \r
-         At a a later date, we may chose to make this a placed module  -->\r
-\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_sp' Name='SP'>\r
             <Directory Id='lib' Name='lib'>\r
               <Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>\r
-                <File Id='xercesc.dll' KeyPath='yes'\r
+                <File KeyPath='yes' Checksum='yes'\r
                       Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug'>\r
                 <Component Id='xercescD.dll' Guid='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>\r
-                  <File Id='xercescd.dll' KeyPath='yes'\r
+                  <File KeyPath='yes' Checksum='yes'\r
                         Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='XERCES.LICENSE' Guid='{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}'>\r
+                <File KeyPath='yes' Name='XERCES.LICENSE'\r
+                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\LICENSE' />\r
+              </Component>\r
+            </Directory><!-- doc -->\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r
     </Directory><!-- TARGETDIR -->\r
   </Module>\r
 </Wix>\r
-\r
-    \r