Updated for 2.5 fileset plus various cleanups

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

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index 12e7ea0..3964ee1 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -30,31 +30,33 @@
           <Directory Id='shibboleth_SP' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>\r
               <Component Id='saml.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
+                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
               </Component>\r
               <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
-                <File KeyPath='yes' Name='samlsign.exe' />\r
+                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
               </Component>\r
               <Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
-                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
-              <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
-                <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+              <Component Id='xmltooling_lite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>\r
                 <Component Id='samlD.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
+                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
-                  <File KeyPath='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
+                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
                 </Component>\r
                 <Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
-                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+                  <File KeyPath='yes' Checksum='yes'\r
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
-                <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
-                  <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+                <Component Id='xmltooling_liteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
+                  <File KeyPath='yes' Checksum='yes'\r
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
                 </Component>\r
-              </Directory> <!-- lib_debug -->\r
+              </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
               <Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
@@ -62,7 +64,7 @@
                 <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><!-- doc -->\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r