Merge commit '2.5.0' into moonshot-packaging-fixes

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

diff --git a/msi/WiX/MergeModules/Shibboleth-x64.wxs b/msi/WiX/MergeModules/Shibboleth-x64.wxs
new file mode 100644 (file)
index 0000000..006523f
--- /dev/null
+++ b/msi/WiX/MergeModules/Shibboleth-x64.wxs
@@ -0,0 +1,59 @@
+<?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='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
+    <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth SP DLLs (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' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release'>\r
+              <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />\r
+              </Component>\r
+              <Component Id='shibsp_lite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />\r
+              </Component>\r
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >\r
+                <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />\r
+                </Component>\r
+                <Component Id='shibsp_liteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />\r
+                </Component>\r
+              </Directory><!-- lib_debug -->\r
+            </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='doc' Guid='{1ACB430F-7846-4565-93FE-3BE1BC1235C1}' Win64='yes'>\r
+                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />\r
+                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />\r
+              </Component>\r
+            </Directory><!-- doc -->\r
+          </Directory><!-- shibboleth_sp -->\r
+        </Directory><!-- shibboleth -->\r
+      </Directory><!-- ProgramFiles64Folder -->\r
+    </Directory><!-- TARGETDIR -->\r
+  </Module>\r
+</Wix>\r
+\r
+    \r