Set native EOL on all wxs, make and vcxproj files. Revert the ones which had become...
[shibboleth/sp.git] / msi / WiX / MergeModules / XmlSec-x64.wxs
index b959022..3ec704f 100644 (file)
@@ -1,91 +1,91 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the "License"); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an "AS IS" BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define XmlSec64Component='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' ?>\r
-<?define XmlSec64Componentd='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>\r
-    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for Santuario (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' \r
-                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>\r
-              <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
-              </Component>\r
-              <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
-              </Component>\r
-              <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
-              </Component>\r
-              <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
-              </Component>\r
-              <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
-              </Component>\r
-              <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
-              </Component>\r
-              <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>\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\x64\VC10\Debug No Xalan'>\r
-                <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
-                </Component>\r
-                <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
-                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
-                </Component>\r
-                <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>\r
-                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
-                </Component>\r
-                <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>\r
-                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
-                </Component>\r
-                <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>\r
-                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
-                </Component>\r
-                <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>\r
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
-                </Component>\r
-                <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>\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='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>\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
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix> \r
+<?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 ?>
+<?define XmlSec64Component='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' ?>
+<?define XmlSec64Componentd='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>
+    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for Santuario (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' 
+                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
+              <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+              </Component>
+              <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+              </Component>
+              <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+              </Component>
+              <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+              </Component>
+              <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+              </Component>
+              <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+              </Component>
+              <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>
+                <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+                </Component>
+                <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+                </Component>
+                <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+                </Component>
+                <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+                </Component>
+                <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+                </Component>
+                <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+                </Component>
+                <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE'
+                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>