projects / shibboleth / sp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixes and cleanups, successful 2.5 build.
[shibboleth/sp.git] / msi / WiX / MergeModules / XmlSec-x64.wxs
diff --git a/msi/WiX/MergeModules/XmlSec-x64.wxs b/msi/WiX/MergeModules/XmlSec-x64.wxs
index 537b0b9..bd02f99 100644 (file)
--- a/msi/WiX/MergeModules/XmlSec-x64.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x64.wxs
@@ -20,67 +20,70 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>\r
-    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for XmlSec (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes Several excutables.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for Santuario (x64)'\r
+             Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\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' \r
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>\r
-              <!-- GUID taken from 2.4.3 installer -->\r
-              <Component Id='xsec_1_4_0.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>\r
-                <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
+              <Component Id='xsec.dll' Guid='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
               </Component>\r
               <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>\r
-                <File KeyPath='yes' Name='c14n.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
               </Component>\r
               <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>\r
-                <File KeyPath='yes' Name='checksig.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
               </Component>\r
               <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>\r
-                <File KeyPath='yes' Name='cipher.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
               </Component>\r
               <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>\r
-                <File KeyPath='yes' Name='siginf.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
               </Component>\r
               <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>\r
-                <File KeyPath='yes' Name='templatesign.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
               </Component>\r
               <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>\r
-                <File KeyPath='yes' Name='txfmout.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' \r
                          FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>\r
-                <Component Id='xsec_1_4_0D.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>\r
-                  <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
+                <Component Id='xsecD.dll' Guid='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
                 </Component>\r
-                <Component Id='c14n.exe2' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
-                  <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>\r
+                <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
                 </Component>\r
-                <Component Id='checksig.exe6' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>\r
-                  <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>\r
+                <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>\r
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
                 </Component>\r
-                <Component Id='cipher.exe4' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>\r
-                  <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>\r
+                <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>\r
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
                 </Component>\r
-                <Component Id='siginf.exe5' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>\r
-                  <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>\r
+                <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>\r
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
                 </Component>\r
-                <Component Id='templatesign.exe3' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>\r
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>\r
+                <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>\r
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
                 </Component>\r
-                <Component Id='txfmout.exe1' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>\r
-                  <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>\r
+                <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>\r
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>\r
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE'\r
+                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />\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
Shibboleth SP