X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2FWiX%2FMergeModules%2FCurl-x86.wxs;h=8976786ebe6f74bad89bf2f9b6b00eb27b76b28c;hb=adaba2f36e678dee0e002264f8f51cf36dd69995;hp=55cdcd40639e958c7df3a26728872f398df039da;hpb=6cd2b019d493c20843f48582045231cc31b4ae72;p=shibboleth%2Fsp.git

diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 55cdcd4..8976786 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -1,61 +1,61 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
-   Development, Inc. (UCAID) under one or more contributor license
-   agreements.  See the NOTICE file distributed with this work for
-   additional information regarding copyright ownership. The UCAID
-   licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
- 
-     http://www.apache.org/licenses/LICENSE-2.0
- 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied.  See the License for the specific language governing
-   permissions and limitations under the License.  -->
-
-<?include ..\Versions.wxi ?>
-
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
-    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
-             Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
-
-    <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
-        <Directory Id='shibboleth' Name='Shibboleth'>
-          <Directory Id='shibboleth_sp' Name='SP'>
-            <Directory Id='lib' Name='lib'>
-              <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
-                <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>
-              </Component>
-              <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
-                <File KeyPath='yes' Checksum='yes'
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>
-              </Component>
-              <Directory Id='lib_debug' Name='debug'>
-                <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>
-                  <File KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
-                </Component>
-                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
-                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
-                </Component>
-              </Directory><!-- lib_debug-->
-            </Directory><!-- lib -->
-            <Directory Id='doc' Name='doc'>
-              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>
-                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
-              </Component>
-            </Directory><!-- doc -->
-          </Directory><!-- shibboleth_SP -->
-        </Directory><!-- shibboleth -->
-      </Directory><!-- ProgramFilesFolder -->
-    </Directory><!-- TARGETDIR -->
-  </Module>
-</Wix>
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
+    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>
+              </Component>
+              <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
+                </Component>
+                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>