[shibboleth-sp2] 69/89: SSPCPP-682 Install message DLL during installation

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit aa9e4559cb9a765001c1ad84be8e91e3113ddb57
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Tue Jun 21 13:21:01 2016 +0100

    SSPCPP-682  Install message DLL during installation
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-682
---
 msi/WiX/ShibbolethSP-main-x64.wxs | 21 +++++++++++++++++++++
 msi/WiX/ShibbolethSP-main-x86.wxs | 21 +++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index e2cbb2b..f7a5726 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -185,6 +185,27 @@
 
       <?include ShibbolethSP-defs-x86.wxi ?>
 
+      <!-- We put in the messages for Isapi and Shibd in this module since all
+           others are shared with x86
+        -->
+      <Component Id='messageFile' Guid='{3FF89632-9F39-4B1B-AA3E-3AF6C8155B92}' Win64='yes' Directory='bin64'>
+        <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\x64\Release\Messages.dll'/>
+        <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon'>
+          <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
+          <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
+          <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+        </RegistryKey>
+        <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter'>
+          <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
+          <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
+          <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+        </RegistryKey>
+      </Component>
+
     </Feature>
   </Product>
 </Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index d9850cb..533565b 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -99,6 +99,27 @@
 
       <?include ShibbolethSP-defs-x86.wxi ?>
 
+      <!-- We put in the messages for Isapi and Shibd in this module since all
+           others are shared with x64
+        -->
+      <Component Id='messageFile' Guid='{7B81ACC5-B79C-426B-ACB8-346A52E5FF60}' Win64='no' Directory='bin'>
+        <File Id='Messages' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.SPMsVCVersion)\Release\Messages.dll'/>
+        <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth Daemon'>
+          <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
+          <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
+          <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+        </RegistryKey>
+        <RegistryKey Root='HKLM' Key='SYSTEM\CurrentControlSet\services\eventlog\Application\Shibboleth ISAPI Filter'>
+          <RegistryValue Name='CategoryCount' Type='integer' Value='2'/>
+          <RegistryValue Name='TypeSupported' Type='integer' Value='15'/>
+          <RegistryValue Name='CategoryMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='EventMessageFile' Type='string' Value='[#Messages]'/>
+          <RegistryValue Name='ParameterMessageFile' Type='string' Value='[#Messages]'/>
+        </RegistryKey>
+      </Component>
+
     </Feature>
   </Product>
 </Wix>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git