diff options
| author | Herbert Dürr <hdu@apache.org> | 2011-10-05 10:26:31 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2011-10-05 10:26:31 +0000 |
| commit | 42a7d23eb89a7466e650a4d273733ddc1f2023dd (patch) | |
| tree | bb4d791697d3655f6365970bce192c4ad75e6e02 /oowintool | |
| parent | 69e41b5230400a8704f41300685eee84cf73b1b2 (diff) | |
allow newer JDK versions for building on WIN
Diffstat (limited to 'oowintool')
| -rwxr-xr-x | oowintool | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/oowintool b/oowintool index 79e02f84211a..a7025e18790e 100755 --- a/oowintool +++ b/oowintool @@ -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"); |