Remove all inline (changeable) components and reference to Versions.wxi.
[shibboleth/sp.git] / msi / WiX / MergeModules / OpenSSL-x64.wxs
index 3395855..196bfed 100644 (file)
@@ -1,63 +1,60 @@
-<?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='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>\r
-    <Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x64'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' >\r
-        <Directory Id='shibboleth64' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp64' Name='SP'>\r
-            <Directory Id='lib64' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >\r
-              <Component Id='libeay64.dll' Guid='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>\r
-                <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='ssleay64.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>\r
-                <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='openssl64.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>\r
-                <File KeyPath='yes' Name='openssl.exe' />\r
-              </Component>\r
-              <Directory Id='lib_debug64' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>\r
-                <Component Id='libeay64.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>\r
-                  <File Id='libeay64.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='ssleay64.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>\r
-                  <File Id='ssleay64.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='openssl64.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>\r
-                  <File Id='openssl64.exe_debug' Name='openssl.exe' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc64' Name='doc'>\r
-              <Component Id='OPENSSL.LICENSE_64' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>\r
-                <File KeyPath='yes' Id='OPENSSL.LICENSE_64'\r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\OPENSSL.LICENSE' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory>\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='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' >
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
+              <Component Id='libeay32.dll' Guid='$(var.LibEay64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='$(var.SSlEay64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
+                <Component Id='libeay32D.dll' Guid='$(var.LibEay64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
+                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
+                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory>
+  </Module>
+</Wix>