Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 17647 invoked from network); 10 Nov 2010 16:27:47 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Nov 2010 16:27:47 -0000 Received: (qmail 81260 invoked by uid 500); 10 Nov 2010 16:28:18 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 81230 invoked by uid 500); 10 Nov 2010 16:28:18 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 81223 invoked by uid 99); 10 Nov 2010 16:28:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Nov 2010 16:28:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Nov 2010 16:28:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 614DB2388A68; Wed, 10 Nov 2010 16:27:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1033569 - in /ant/core/trunk/src/main/org/apache/tools/ant: Diagnostics.java util/JavaEnvUtils.java Date: Wed, 10 Nov 2010 16:27:04 -0000 To: notifications@ant.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101110162704.614DB2388A68@eris.apache.org> Author: bodewig Date: Wed Nov 10 16:27:04 2010 New Revision: 1033569 URL: http://svn.apache.org/viewvc?rev=1033569&view=rev Log: print whether Kaffe/gcj have been detected in -diagnostics Modified: ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java ant/core/trunk/src/main/org/apache/tools/ant/util/JavaEnvUtils.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java?rev=1033569&r1=1033568&r2=1033569&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/Diagnostics.java Wed Nov 10 16:27:04 2010 @@ -399,6 +399,10 @@ public final class Diagnostics { out.println(MagicNames.ANT_VERSION + ": " + p.getProperty(MagicNames.ANT_VERSION)); out.println(MagicNames.ANT_JAVA_VERSION + ": " + p.getProperty(MagicNames.ANT_JAVA_VERSION)); + out.println("Is this the Kaffe VM? " + + (JavaEnvUtils.isKaffe() ? "yes" : "no")); + out.println("Is this gij/gcj? " + + (JavaEnvUtils.isGij() ? "yes" : "no")); out.println(MagicNames.ANT_LIB + ": " + p.getProperty(MagicNames.ANT_LIB)); out.println(MagicNames.ANT_HOME + ": " + p.getProperty(MagicNames.ANT_HOME)); } Modified: ant/core/trunk/src/main/org/apache/tools/ant/util/JavaEnvUtils.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/JavaEnvUtils.java?rev=1033569&r1=1033568&r2=1033569&view=diff ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/util/JavaEnvUtils.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/util/JavaEnvUtils.java Wed Nov 10 16:27:04 2010 @@ -210,6 +210,7 @@ public final class JavaEnvUtils { /** * Checks whether the current Java VM is the GNU interpreter gij * or we are running in a gcj precompiled binary. + * @since Ant 1.8.2 * @return true if the current Java VM is gcj/gij. */ public static boolean isGij() {