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() {
