Updated for 2.5 fileset plus various cleanups

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

diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index cd07b8b..73e9c00 100644 (file)
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -29,23 +29,23 @@
           <Directory Id='shibboleth_sp' Name='SP'>\r
             <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
               <Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>\r
-                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
+                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
               </Component>\r
               <Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>\r
-                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
+                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
               </Component>\r
               <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
-                <File KeyPath='yes' Name='openssl.exe' />\r
+                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >\r
-                <Component Id='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
-                  <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+                <Component Id='libeay32D.dll' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
-                <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
-                  <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+                <Component Id='ssleay32D.dll' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
                 </Component>\r
                 <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
-                  <File Id='openssl.exe_debug' KeyPath='yes' Name='openssl.exe' />\r
+                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r