[cpp-sp] branch master updated: Remove version from SCM display, prevent keygen on upgrades.

[Scott Cantor]

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

scantor 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=4fecf3673f3759c8b1d700fa5032406ca25b125d

The following commit(s) were added to refs/heads/master by this push:
       new  4fecf36   Remove version from SCM display, prevent keygen on upgrades.
4fecf36 is described below

commit 4fecf3673f3759c8b1d700fa5032406ca25b125d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 9 13:16:20 2018 -0400

    Remove version from SCM display, prevent keygen on upgrades.
---
 msi/WiX/ShibbolethSP-main-x86.wxs | 2 +-
 msi/WiX/ShibbolethSP-noarch.wxs   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index f8c0d9a..e3cb6b9 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -100,7 +100,7 @@
       <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}" Directory="sbin">
         <File KeyPath="yes" Checksum="yes" Source="$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Release\shibd.exe" />
         <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
-        <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth $(var.ShibbolethVersion) Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
+        <ServiceInstall Id="shibd" Name="shibd_Default" DisplayName="Shibboleth Daemon (Default)" Description="Manages shared state and offloads SAML processing from Shibboleth web server modules." Arguments="-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"" Type="ownProcess" Start="auto" ErrorControl="ignore" />
         <ServiceControl Id="shibd_Default" Name="shibd_Default" Stop="both" Remove="uninstall" Start="install" Wait="no" />
         <!-- We put in the messages for Isapi and Shibd in this module since all others are shared with x64 -->
         <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Shibboleth\Shibboleth Service Provider">
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 769b661..c0ec1ad 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -193,11 +193,11 @@
       <Custom Action="SetEditConfigFiles" Before="CostInitialize">NOT Installed</Custom>
       <Custom Action="EditConfigFiles" After="InstallFiles">NOT Installed</Custom>
 
-      <Custom Action="SetKeyGenSigning" Before="CostInitialize">NOT Installed</Custom>
-      <Custom Action="SetKeyGenEncrypt" Before="CostInitialize">NOT Installed</Custom>
+      <Custom Action="SetKeyGenSigning" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
+      <Custom Action="SetKeyGenEncrypt" Before="CostInitialize">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
       <!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->
-      <Custom Action="KeyGenSigning" After="WriteEnvironmentStrings">NOT Installed</Custom>
-      <Custom Action="KeyGenEncrypt" After="WriteEnvironmentStrings">NOT Installed</Custom>
+      <Custom Action="KeyGenSigning" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
+      <Custom Action="KeyGenEncrypt" After="WriteEnvironmentStrings">(NOT Installed) AND (NOT ALREADYINSTALLED)</Custom>
 
       <!-- IIS handling is no longer architecture independent and happens in ShibbolethSP-main-x?? -->
 

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