Merge commit '2.5.0' into moonshot-packaging-fixes

[shibboleth/sp.git] / msi / WiX / MergeModules / Log4Shib-x86.wxs

diff --git a/msi/WiX/MergeModules/Log4Shib-x86.wxs b/msi/WiX/MergeModules/Log4Shib-x86.wxs
new file mode 100644 (file)
index 0000000..ab96d28
--- /dev/null
+++ b/msi/WiX/MergeModules/Log4Shib-x86.wxs
@@ -0,0 +1,57 @@
+<?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='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
+    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'\r
+             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
+\r
+    <Directory Id='TARGETDIR' Name='SourceDir'>\r
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
+        <Directory Id='shibboleth' Name='Shibboleth'>\r
+          <Directory Id='shibboleth_SP' Name='SP'>\r
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>\r
+              <Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>\r
+                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
+              </Component>\r
+              <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>\r
+                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
+              </Component>\r
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>\r
+                <Component Id='log4shibD.dll' Guid='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
+                </Component>\r
+                <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>\r
+                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
+                </Component>\r
+              </Directory><!-- lib_debug-->\r
+            </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
+                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />\r
+              </Component>\r
+            </Directory><!-- doc -->\r
+          </Directory><!-- shibboleth_SP -->\r
+        </Directory><!-- shibboleth -->\r
+      </Directory><!-- ProgramFilesFolder -->\r
+    </Directory><!-- TARGETDIR -->\r
+  </Module>\r
+</Wix>\r