summaryrefslogtreecommitdiff
path: root/oowintool
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-01 16:37:08 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-01 16:37:22 +0000
commit32781c2d268ed94eb46318a0398385baf31368c4 (patch)
treeb0f3cf78d7ff65d0e5bb8f2bc5affe9a73f5e475 /oowintool
parent5af303c0cd4d46c459c6b90712843967d716c866 (diff)
given that we can build with java7 now, allow it for windows too
Diffstat (limited to 'oowintool')
-rwxr-xr-xoowintool3
1 files changed, 2 insertions, 1 deletions
diff --git a/oowintool b/oowintool
index 28f16da2f624..7c74ae027b90 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);