Set native EOL on all wxs, make and vcxproj files. Revert the ones which had become...
[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Shibboleth-schemas.wxs
index d866cb3..65a90e4 100644 (file)
@@ -1,82 +1,82 @@
-<?xml version='1.0' encoding='UTF-8'?>\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
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ShibbolethSPSchemasMergeModule' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
-    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth SP schemas'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
-        <Directory Id='Shibboleth' Name='Shibboleth' >\r
-          <Directory Id='SP' Name='SP' >\r
-            <Directory Id='xml' Name='xml' >\r
-              <Directory Id='xml_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\schemas' >\r
-                <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>\r
-                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>\r
-                  <File KeyPath='yes' Name='shibboleth.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_1.0.xsd' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>\r
-                  <File KeyPath='yes' Id='metadata_1.0.xsd' Name='shibboleth-metadata-1.0.xsd' />\r
-                </Component>\r
-                <Component Id='attribute_map.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>\r
-                  <File KeyPath='yes' Id='attribute_map.xsd' Name='shibboleth-2.0-attribute-map.xsd' />\r
-                </Component>\r
-                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>\r
-                  <File KeyPath='yes' Id='afp.xsd' Name='shibboleth-2.0-afp.xsd' />\r
-                </Component>\r
-                <Component Id='afp_mf_basic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>\r
-                  <File KeyPath='yes' Id='afp_mf_basic.xsd' Name='shibboleth-2.0-afp-mf-basic.xsd' />\r
-                </Component>\r
-                <Component Id='afp_mf_saml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>\r
-                  <File KeyPath='yes' Id='afp_mf_saml.xsd' Name='shibboleth-2.0-afp-mf-saml.xsd' />\r
-                </Component>\r
-                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>\r
-                  <File KeyPath='yes' Name='WS-Trust.xsd' />\r
-                </Component>\r
-                <Component Id='sp_notify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>\r
-                  <File KeyPath='yes' Id='sp_notify.xsd' Name='shibboleth-2.0-sp-notify.xsd' />\r
-                </Component>\r
-                <Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>\r
-                  <File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />\r
-                </Component>\r
-                <Component Id='native_sp_protocols.xsd' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>\r
-                  <File KeyPath='yes' Id='native_sp_protocols.xsd' Name='shibboleth-2.0-native-sp-protocols.xsd' />\r
-                </Component>\r
-              </Directory><!--xml_shibboleth-->\r
-            </Directory><!--xml-->\r
-          </Directory><!--SP-->\r
-        </Directory><!--Shibboleth-->\r
-      </Directory><!--CommonAppDataFolder-->\r
-    </Directory><!--TargetDir-->\r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
-                  Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' \r
-                  Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
-    <InstallExecuteSequence>\r
-      <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r
-    </InstallExecuteSequence>\r
-\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 ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPSchemasMergeModule' Language='1033' Version='$(var.ShibbolethDllVersion)'>
+    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth SP schemas'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='Shibboleth' Name='Shibboleth' >
+          <Directory Id='SP' Name='SP' >
+            <Directory Id='xml' Name='xml' >
+              <Directory Id='xml_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\schemas' >
+                <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>
+                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in' />
+                </Component>
+                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>
+                  <File KeyPath='yes' Name='shibboleth.xsd' />
+                </Component>
+                <Component Id='metadata_1.0.xsd' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>
+                  <File KeyPath='yes' Id='metadata_1.0.xsd' Name='shibboleth-metadata-1.0.xsd' />
+                </Component>
+                <Component Id='attribute_map.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>
+                  <File KeyPath='yes' Id='attribute_map.xsd' Name='shibboleth-2.0-attribute-map.xsd' />
+                </Component>
+                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>
+                  <File KeyPath='yes' Id='afp.xsd' Name='shibboleth-2.0-afp.xsd' />
+                </Component>
+                <Component Id='afp_mf_basic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>
+                  <File KeyPath='yes' Id='afp_mf_basic.xsd' Name='shibboleth-2.0-afp-mf-basic.xsd' />
+                </Component>
+                <Component Id='afp_mf_saml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>
+                  <File KeyPath='yes' Id='afp_mf_saml.xsd' Name='shibboleth-2.0-afp-mf-saml.xsd' />
+                </Component>
+                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>
+                  <File KeyPath='yes' Name='WS-Trust.xsd' />
+                </Component>
+                <Component Id='sp_notify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>
+                  <File KeyPath='yes' Id='sp_notify.xsd' Name='shibboleth-2.0-sp-notify.xsd' />
+                </Component>
+                <Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
+                  <File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />
+                </Component>
+                <Component Id='native_sp_protocols.xsd' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>
+                  <File KeyPath='yes' Id='native_sp_protocols.xsd' Name='shibboleth-2.0-native-sp-protocols.xsd' />
+                </Component>
+              </Directory><!--xml_shibboleth-->
+            </Directory><!--xml-->
+          </Directory><!--SP-->
+        </Directory><!--Shibboleth-->
+      </Directory><!--CommonAppDataFolder-->
+    </Directory><!--TargetDir-->
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml' />
+    <InstallExecuteSequence>
+      <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
+  </Module>
+</Wix>