[cpp-sp] 01/03: SSPCPP-378 Parameterize Keygen

[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=cf75cf317901ab94e1be974725b8866c3d6faa2d

commit cf75cf317901ab94e1be974725b8866c3d6faa2d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Mar 22 10:55:40 2018 +0000

    SSPCPP-378 Parameterize Keygen
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-378
    
    Add a property KEYGEN_EXTRA to pass extra parameters to keygen
---
 msi/WiX/ShibbolethSP-noarch.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 244f3a0..1c888e8 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -167,8 +167,8 @@
     <CustomAction Id="EditConfigFiles" BinaryKey="EditConfigFileSrc" VBScriptCall="" Execute="deferred" Impersonate="no" />
     <CustomAction Id="SetEditConfigFiles" Property="EditConfigFiles" Value="[INSTALLDIR];@;[IS64BITINSTALL]" />
 
-    <CustomAction Id="KeyGen" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Impersonate="no" />
-    <CustomAction Id="SetKeyGen" Property="KeyGen" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat"" />
+    <CustomAction Id="KeyGen" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="SetKeyGen" Property="KeyGen" Value=""[INSTALLDIR]etc\shibboleth\keygen.bat" [KEYGEN_EXTRA]" />
 
     <!-- Inherit the installation dir if one was set -->
     <CustomAction Id="InheritInstallDir" Property="INSTALLDIR" Value="[OLD_INSTALLDIR]" />

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