Fixes and cleanups, successful 2.5 build.

[shibboleth/sp.git] / msi / WiX / MergeModules / OpenSAML-x64.wxs

diff --git a/msi/WiX/MergeModules/OpenSAML-x64.wxs b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index cbf5887..047277a 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x64.wxs
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
-<!-- TODO roll in xmltooling, make subsidiary to Shib Ad documentation -->\r
+\r
 <!-- Licensed to the University Corporation for Advanced Internet\r
    Development, Inc. (UCAID) under one or more contributor license\r
    agreements.  See the NOTICE file distributed with this work for\r
@@ -21,34 +21,53 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
     <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes DDLs SAMLSign'\r
+             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Release\' >\r
-              <Component Id='saml2_0.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Release\'>\r
+              <Component Id='saml.dll' Guid='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
               </Component>\r
               <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>\r
-                <File KeyPath='yes' Name='samlsign.exe' />\r
+                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
+              </Component>\r
+              <Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\x64\Debug\'>\r
-                <Component Id='saml2_0D.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
+              <Component Id='xmltooling_lite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+              </Component>\r
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>\r
+                <Component Id='samlD.dll' Guid='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
+                </Component>\r
+                <Component Id='samlsign.exe_debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
                 </Component>\r
-                <Component Id='samlsign.exe_Debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
-                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
+                <Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes'\r
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
-              </Directory><!-- lib_debug-->\r
+                <Component Id='xmltooling_liteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes'\r
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+                </Component>\r
+              </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='doc' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
+                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />\r
+                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />\r
+                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />\r
+              </Component>\r
+            </Directory><!-- doc -->\r
+          </Directory><!--shibboleth_SP-->\r
+        </Directory><!--shibboleth-->\r
+      </Directory><!--ProgramFiles64Folder-->\r
+    </Directory>\r
   </Module>\r
 </Wix>\r
-\r
-    \r