oowintool | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
New commits: commit eccdc9780579dc9e762fd9760206b752ec5c36d5 Author: Damjan Jovanovic <dam...@apache.org> Date: Sat Mar 3 11:06:53 2018 +0000 Add Java 1.9 detection to oowintool. Patch by: me diff --git a/oowintool b/oowintool index 8ebdae5dcd67..9d98e24720d7 100755 --- a/oowintool +++ b/oowintool @@ -289,8 +289,16 @@ sub print_jdk_dir() 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); + if (defined $dir) { + print cygpath($dir, 'w', $output_format); + } else { + # Java 1.9 had to be different: + my $currentVersion = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/CurrentVersion"); + defined $currentVersion || exit 1; + my $newDir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/JDK/" . $currentVersion . "/JavaHome"); + defined $newDir || exit 1; + print cygpath($newDir, 'w', $output_format); + } } sub print_nsis_dir() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits