Remove all inline (changeable) components and reference to Versions.wxi.

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / FastCGI-x64.wxs

diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index c086b8d..25ba131 100644 (file)
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -1,54 +1,52 @@
-<?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
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>\r
-    <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\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
-              <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>\r
-                <File KeyPath='yes' Name='FASTCGI.LICENSE'\r
-                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth -->\r
-        </Directory><!-- shibboleth_SP -->\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.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>
+    <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             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'>
+              <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>
+                <File KeyPath='yes' Name='FASTCGI.LICENSE'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth -->
+        </Directory><!-- shibboleth_SP -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>