A bit early for this I guess but might as well. Makes Ant notice the future
JDK 1.4 the same way it does 1.[0123]. Also noting location of JDK when
running -verbose.

-Jesse

-- 
Jesse Glick   <mailto:[EMAIL PROTECTED]>
NetBeans, Open APIs  <http://www.netbeans.org/>
tel (+4202) 3300-9161 Sun Micro x49161 Praha CR
Index: src/main/org/apache/tools/ant/Project.java
===================================================================
RCS file: 
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.56
diff -u -t -r1.56 Project.java
--- src/main/org/apache/tools/ant/Project.java  2001/03/19 13:05:45     1.56
+++ src/main/org/apache/tools/ant/Project.java  2001/05/03 19:40:22
@@ -89,6 +89,7 @@
     public static final String JAVA_1_1 = "1.1";
     public static final String JAVA_1_2 = "1.2";
     public static final String JAVA_1_3 = "1.3";
+    public static final String JAVA_1_4 = "1.4";
 
     public static final String TOKEN_START = "@";
     public static final String TOKEN_END = "@";
@@ -126,6 +127,8 @@
             javaVersion = JAVA_1_2;
             Class.forName("java.lang.StrictMath");
             javaVersion = JAVA_1_3;
+            Class.forName("java.lang.CharSequence");
+            javaVersion = JAVA_1_4;
         } catch (ClassNotFoundException cnfe) {
             // swallow as we've hit the max class version that
             // we have
@@ -348,7 +351,7 @@
             throw new BuildException("Ant cannot work on Java 1.0");
         }
 
-        log("Detected Java Version: " + javaVersion, MSG_VERBOSE);
+        log("Detected Java version: " + javaVersion + " in: " + 
System.getProperty("java.home"), MSG_VERBOSE);
 
         log("Detected OS: " + System.getProperty("os.name"), MSG_VERBOSE);
     }

Reply via email to