openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1814757 - /openoffice/trunk/main/oowintool
Date Thu, 09 Nov 2017 17:58:57 GMT
Author: damjan
Date: Thu Nov  9 17:58:57 2017
New Revision: 1814757

URL: http://svn.apache.org/viewvc?rev=1814757&view=rev
Log:
Add Java 8 to the JDKs known to oowintool,
and clean up error reporting so ./configure looks better
(no "use of undefined" errors).

Patch by: me


Modified:
    openoffice/trunk/main/oowintool

Modified: openoffice/trunk/main/oowintool
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oowintool?rev=1814757&r1=1814756&r2=1814757&view=diff
==============================================================================
--- openoffice/trunk/main/oowintool (original)
+++ openoffice/trunk/main/oowintool Thu Nov  9 17:58:57 2017
@@ -266,17 +266,20 @@ sub print_dotnetsdk_dir()
     my $dir = 
           reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1")
||
           reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
+    defined $dir || exit 1;
     print cygpath ($dir, 'w', $output_format);
 }
 
 sub print_jdk_dir()
 {
     my $dir =
+	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.8/JavaHome")
||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.7/JavaHome")
||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.6/JavaHome")
||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome")
||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome")
||
 	  reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
+    defined $dir || exit 1;
     print cygpath($dir, 'w', $output_format); 
 }
 



Mime
View raw message