[Libreoffice-commits] .: oowintool

[Caolán McNamara]

 oowintool |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 32781c2d268ed94eb46318a0398385baf31368c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 1 16:37:08 2012 +0000

    given that we can build with java7 now, allow it for windows too

diff --git a/oowintool b/oowintool
index 28f16da..7c74ae0 100755
--- a/oowintool
+++ b/oowintool
@@ -227,8 +227,9 @@ 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.6/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");
     print cygpath($dir, 'w', $output_format);