Updated for 2.5 fileset plus various cleanups

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

diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 2272bdc..55cdcd4 100644 (file)
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -16,40 +16,43 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define CurlVersion='7.21.2' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>\r
     <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_sp' Name='SP'>\r
             <Directory Id='lib' Name='lib'>\r
-\r
               <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>\r
-                <File KeyPath='yes' \r
+                <File KeyPath='yes' Checksum='yes'\r
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>\r
               </Component>\r
               <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>\r
-                <File KeyPath='yes' \r
+                <File KeyPath='yes' Checksum='yes'\r
                       Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug'>\r
                 <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>\r
-                  <File KeyPath='yes' \r
+                  <File KeyPath='yes' Checksum='yes'\r
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>\r
                 </Component>\r
-                <Component Id='curl.exe1' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>\r
-                  <File Id='curl.exe_debug' KeyPath='yes' \r
+                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>\r
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'\r
                         Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>\r
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />\r
+              </Component>\r
+            </Directory><!-- doc -->\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r