incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1179167 - /incubator/ooo/trunk/main/oowintool
Date Wed, 05 Oct 2011 11:26:31 GMT
Author: hdu
Date: Wed Oct  5 11:26:31 2011
New Revision: 1179167

URL: http://svn.apache.org/viewvc?rev=1179167&view=rev
Log:
allow newer JDK versions for building on WIN

Modified:
    incubator/ooo/trunk/main/oowintool

Modified: incubator/ooo/trunk/main/oowintool
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/oowintool?rev=1179167&r1=1179166&r2=1179167&view=diff
==============================================================================
--- incubator/ooo/trunk/main/oowintool (original)
+++ incubator/ooo/trunk/main/oowintool Wed Oct  5 11:26:31 2011
@@ -98,16 +98,16 @@ sub print_psdk_home()
     if (!defined $value)
     {
         $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/CurrentInstallFolder');
-	}
+    }
     if (!defined $value)
     {
 	    $value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install
Dir');
-	}
+    }
     if (!defined $value)
     {
 	    $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install
Dir');
 	    $value = reg_get_value ($key);
-	}
+    }
     if (!defined $value)
     {
         my $dir = cygpath (find_msvc()->{'product_dir'}, 'w', $output_format);
@@ -252,6 +252,8 @@ sub print_dotnetsdk_dir()
 sub print_jdk_dir()
 {
     my $dir =
+	  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");



Mime
View raw message