changed the test for 1.5 support so that it only works if jsr14 libraries are infront of tools.jar on the class path

jeloguy15 · jeloguy15 · commit 59987ac50150 · 2004-12-06T19:51:13.000Z
git-svn-id: file:///tmp/test-svn/trunk@2792 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/Version.java b/dynamicjava/src/koala/Version.java
@@ -53,7 +53,7 @@
  * This file is copied to Version.java by the build process, which also
  * fills in the right values of the date and time.
  *
- * This javadoc corresponds to build drjava-20041113-0213;
+ * This javadoc corresponds to build drjava-20041206-1949;
  *
  * @version $Id$
  */
@@ -62,7 +62,7 @@ public abstract class Version {
    * This string will be automatically expanded upon "ant commit".
    * Do not edit it by hand!
    */
-  private static final String BUILD_TIME_STRING = "20041113-0213";
+  private static final String BUILD_TIME_STRING = "20041206-1949";
 
   /** A {@link Date} version of the build time. */
   private static final Date BUILD_TIME = _getBuildDate();
diff --git a/dynamicjava/src/koala/build-common.xml.15 b/dynamicjava/src/koala/build-common.xml.15
@@ -12,6 +12,7 @@
   Assumes these targets exist:
     stable
     development
+    jar
  
 -->
 <!-- <taskdef name="javamake" classname="com.sun.tools.javamake.ant.JavaMake"/>  -->
@@ -103,24 +104,21 @@ target="jsr14"
 <!-- Commit source to CVS archive
      Before doing do, we update our copy with the CVS copy. This ensures that
      if there were any clashes, we have to resolve them now. Then we
-     recompile (from scratch) and retest. If this all succeeds, we can commit.
+     recompile (from scratch), create a jar file, and retest. If this all succeeds, we can commit.
 
      After committing, we tag the build we just made with the tag
      projectname-date-time.
 -->
-<target name="do-commit" depends="clean, update, test, make-version-stamp">
+<target name="do-commit" depends="clean, update, jar, test, make-version-stamp">  
   <property name="version-tag"
             value="${ant.project.name}-${DSTAMP}-${TSTAMP}" />
 
   <!-- recompile to make new version number get into code. -->
   <echo message="All tests passed. Rebuilding to put version tag (${version-tag}) into the code." />
   <antcall target="compile" />
 
-  <!-- Copy the dynamicjava.jar to the lib directory and commit it. -->
-  <copy file="${jarfile}"
-          tofile="${lib_dir}/dynamicjava.jar"
-          overwrite="yes"/>
-  <echo message="Copied current dynamicjava.jar to the lib directory. Please commit it to keep DrJava in sync with the koala code base." />
+  <!-- Remind user to commit the new dynamicjar.jar file. -->
+  <echo message="The built dynamicjava.jar file has been copied to the lib directory. Please commit it to keep DrJava in sync with the koala code base." />
   
   <tempfile property="commit-comments-filename" 
             destdir="${java.io.tmpdir}"
@@ -223,7 +221,7 @@ target="jsr14"
          bootclasspath="${jsr14_classpath}:${jsr14_collect_classpath}:${sun.boot.class.path}" 
   classpath="${classpath_text}"
          source="1.5"
-       target="jsr14"
+       target="1.5"
          debug="on"
          fork="on"
          optimize="off">
diff --git a/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java b/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java
@@ -103,7 +103,8 @@ public class TigerUtilities {
   public static void resetVersion() {
     try {
       //Class.forName("java.lang.Enum");
-      Class.forName("com.sun.javadoc.ParameterizedType");
+//      Class.forName("com.sun.javadoc.ParameterizedType");
+      java.lang.reflect.Method.class.getMethod("isVarArgs", new Class[]{});
       _tigerEnabled = true;
     }
     catch (Throwable t) {
