Merge commit '2.5.0' into moonshot-packaging-fixes

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

diff --git a/msi/WiX/MergeModules/Zlib-x64.wxs b/msi/WiX/MergeModules/Zlib-x64.wxs
new file mode 100644 (file)
index 0000000..7f74c89
--- /dev/null
+++ b/msi/WiX/MergeModules/Zlib-x64.wxs
@@ -0,0 +1,47 @@
+<?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='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
+    <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (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='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes'\r
+                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>\r
+              </Component>\r
+              <Directory Id='lib_debug' Name='debug'>\r
+                <Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes'\r
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
+                </Component>\r
+              </Directory><!-- lib_debug-->\r
+            </Directory><!-- lib -->\r
+          </Directory><!-- shibboleth_sp -->\r
+        </Directory><!-- shibboleth -->\r
+      </Directory><!-- ProgramFilesFolder -->\r
+    </Directory><!-- TARGETDIR -->\r
+  </Module>\r
+</Wix>\r