[cpp-sp] branch master updated: Minor nits in the installer build:

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=b01aa5029b38333a356c3ad859321e2c77ce9378

The following commit(s) were added to refs/heads/master by this push:
       new  b01aa50   Minor nits in the installer build:
b01aa50 is described below

commit b01aa5029b38333a356c3ad859321e2c77ce9378
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 27 19:55:32 2018 +0100

    Minor nits in the installer build:
    
    - Component names cannot have '-' in them, replace with '_'
    - Fix longstanding mix-ed architecture issue in registering
      to the event viewer.  64bit DLLs go into the 64 bit registry
---
 msi/WiX/ShibbolethSP-defs-x86.wxi | 2 +-
 msi/WiX/ShibbolethSP-main-x64.wxs | 4 ++--
 msi/WiX/ShibbolethSP-noarch.wxs   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 707302a..72bbe42 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -34,7 +34,7 @@
   <ComponentRef Id="apache22.config.in" />
   <ComponentRef Id="apache24.config.in" />
   <ComponentRef Id="metadataError.html" />
-  <ComponentRef Id="win-native.logger" />
+  <ComponentRef Id="win_native.logger" />
   <ComponentRef Id="sessionError.html" />
   <ComponentRef Id="shibd.logger.in" />
   <ComponentRef Id="var_cache_shibboleth_folder" />
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 4078412..eff59cf 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -191,8 +191,8 @@
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
           <RegistryValue Name="CategoryCount" Type="integer" Value="8" />
           <RegistryValue Name="TypesSupported" Type="integer" Value="7" />
-          <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
-          <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFilesFolder]Shibboleth\SP\lib\NTEventLogAppender.dll;[#Messages]" />
+          <RegistryValue Name="CategoryMessageFile" Type="string" Value="[ProgramFiles64Folder]Shibboleth\SP\lib\NTEventLogAppender.dll" />
+          <RegistryValue Name="EventMessageFile" Type="string" Value="[ProgramFiles64Folder]Shibboleth\SP\lib\NTEventLogAppender.dll;[#Messages]" />
           <RegistryValue Name="ParameterMessageFile" Type="string" Value="[#Messages]" />
         </RegistryKey>
       </Component>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 03ff672..d2b4128 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -130,7 +130,7 @@
             <Component Id="metadataError.html" Guid="{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}">
               <File KeyPath="yes" Name="metadataError.html" />
             </Component>
-            <Component Id="win-native.logger" Guid="{B2EBC853-279B-4EA1-BC84-A0EC0E5F3676}">
+            <Component Id="win_native.logger" Guid="{B2EBC853-279B-4EA1-BC84-A0EC0E5F3676}">
               <File KeyPath="yes" Name="native.logger" Source="$(var.SPBuildDirectory)\cpp-sp\configs\win-native.logger" />
             </Component>
             <Component Id="sessionError.html" Guid="{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.