Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0AC1200D37 for ; Thu, 9 Nov 2017 18:58:59 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF1FA160BEF; Thu, 9 Nov 2017 17:58:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2889B1609C8 for ; Thu, 9 Nov 2017 18:58:59 +0100 (CET) Received: (qmail 70465 invoked by uid 500); 9 Nov 2017 17:58:58 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 70456 invoked by uid 99); 9 Nov 2017 17:58:58 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Nov 2017 17:58:58 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5DEAE3A0222 for ; Thu, 9 Nov 2017 17:58:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1814757 - /openoffice/trunk/main/oowintool Date: Thu, 09 Nov 2017 17:58:57 -0000 To: commits@openoffice.apache.org From: damjan@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171109175857.5DEAE3A0222@svn01-us-west.apache.org> archived-at: Thu, 09 Nov 2017 17:58:59 -0000 Author: damjan Date: Thu Nov 9 17:58:57 2017 New Revision: 1814757 URL: http://svn.apache.org/viewvc?rev=1814757&view=rev Log: Add Java 8 to the JDKs known to oowintool, and clean up error reporting so ./configure looks better (no "use of undefined" errors). Patch by: me Modified: openoffice/trunk/main/oowintool Modified: openoffice/trunk/main/oowintool URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oowintool?rev=1814757&r1=1814756&r2=1814757&view=diff ============================================================================== --- openoffice/trunk/main/oowintool (original) +++ openoffice/trunk/main/oowintool Thu Nov 9 17:58:57 2017 @@ -266,17 +266,20 @@ sub print_dotnetsdk_dir() my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") || reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0"); + defined $dir || exit 1; print cygpath ($dir, 'w', $output_format); } sub print_jdk_dir() { my $dir = + reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.8/JavaHome") || 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"); + defined $dir || exit 1; print cygpath($dir, 'w', $output_format); }