[java-identity-provider] 02/02: IDP-1607 Check for CRTL on install

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ffa02ead9cc9ba74174f5c65df7e3245dfac7c21

commit ffa02ead9cc9ba74174f5c65df7e3245dfac7c21
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Feb 4 11:26:00 2021 +0000

    IDP-1607 Check for CRTL on install
    
    https://issues.shibboleth.net/jira/browse/IDP-1607
---
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index acf764948..c0383aa06 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -25,8 +25,7 @@
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
         <MediaTemplate EmbedCab="yes" />
 
-        <Condition Message="Shibboleth requires a Windows NT-based operating system.">NOT Version9X</Condition>
-	<Condition 
+        <Condition Message="C run time libraray not installed">UCRTBASE_DLL</Condition>
 
         <!-- Information for the properties page of the msi -->
 
@@ -90,6 +89,13 @@
             </DirectorySearch>
         </Property>
 
+	<Property Id="UCRTBASE_DLL" Secure="yes">
+            <DirectorySearch Id="UcrtBaseSearch" Depth="0" Path="[System64Folder]">
+                <FileSearch Id="UcrtnSearch" Name="ucrtbase.dll" />
+            </DirectorySearch>
+        </Property>
+
+
         <CustomAction Id="NoJavaBin" Error="Could not locate Java.exe.  Please check the value for JAVA_HOME." />
 
         <!-- Inherit the setup, if they were. -->

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