Updated for 2.5 fileset plus various cleanups

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

diff --git a/msi/WiX/MergeModules/XmlSec-x86.wxs b/msi/WiX/MergeModules/XmlSec-x86.wxs
index ddfd94a..4ba13e7 100644 (file)
--- a/msi/WiX/MergeModules/XmlSec-x86.wxs
+++ b/msi/WiX/MergeModules/XmlSec-x86.wxs
@@ -30,54 +30,55 @@
             <Directory Id='lib' Name='lib' \r
                        FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>\r
               <Component Id='xsec.dll' Guid='{8920023D-92CA-4012-8BF8-6D80D791375D}'>\r
-                <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
               </Component>\r
               <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>\r
-                <File KeyPath='yes' Name='c14n.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
               </Component>\r
               <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>\r
-                <File KeyPath='yes' Name='checksig.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
               </Component>\r
               <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>\r
-                <File KeyPath='yes' Name='cipher.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
               </Component>\r
               <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>\r
-                <File KeyPath='yes' Name='siginf.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
               </Component>\r
               <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>\r
-                <File KeyPath='yes' Name='templatesign.exe'/>\r
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
               </Component>\r
               <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>\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\Win32\VC10\Debug No Xalan'>\r
                 <Component Id='xsecD.dll' Guid='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>\r
-                  <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
                 </Component>\r
                 <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>\r
-                  <File Id='c14n.exe_debug' KeyPath='yes' Name='c14n.exe'/>\r
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
                 </Component>\r
                 <Component Id='checksig.exe_debug' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>\r
-                  <File Id='checksig.exe_debug' KeyPath='yes' Name='checksig.exe'/>\r
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
                 </Component>\r
                 <Component Id='cipher.exe_debug' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>\r
-                  <File Id='cipher.exe_debug' KeyPath='yes' Name='cipher.exe'/>\r
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
                 </Component>\r
                 <Component Id='siginf.exe_debug' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>\r
-                  <File Id='siginf.exe_debug' KeyPath='yes' Name='siginf.exe'/>\r
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
                 </Component>\r
                 <Component Id='templatesign.exe_debug' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>\r
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Name='templatesign.exe'/>\r
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
                 </Component>\r
                 <Component Id='txfmout.exe_debug' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>\r
-                  <File Id='txfmout.exe_debug' KeyPath='yes' Name='txfmout.exe'/>\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='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>\r
-                <File KeyPath='yes' Name='SANTUARIO.LICENSE' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />\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
@@ -86,5 +87,3 @@
     </Directory><!-- TARGETDIR -->\r
   </Module>\r
 </Wix> \r
-\r
-  \r