tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jason Hunter <jhun...@acm.org>
Subject cvs commit: jakarta-tools/ant/src/main/org/apache/tools/ant/taskdefs Javac.java
Date Mon, 18 Oct 1999 04:35:26 GMT
(Manually reposted after previous mailer config failure.)

-jh-

jhunter     99/10/17 20:03:41

  Modified:    .        ant.jar
               ant/src/main/org/apache/tools/ant ProjectHelper.java
               ant/src/main/org/apache/tools/ant/taskdefs Javac.java
  Log:
  Changes to make ant run on JDK 1.1.x and on SGI/IRIX.
  Had to remove some JDK 1.2 getAbsoluteFile()/getParentFile() methods,
  and had to make the existing JDK 1.1 auto-detection logic smart enough
to
  understand SGI's unconventional java.version property value.
  
  Revision  Changes    Path
  1.8       +103 -102  jakarta-tools/ant.jar
  
        <<Binary file>>
  
  
  1.5       +4 -1     
jakarta-tools/ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file:
/home/cvs/jakarta-tools/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProjectHelper.java        1999/10/11 01:57:20     1.4
  +++ ProjectHelper.java        1999/10/18 03:03:39     1.5
  @@ -66,7 +66,10 @@
                throw new BuildException(msg);
            }
        } else {
  -        
project.setBaseDir(buildFile.getAbsoluteFile().getParentFile());
  +            // Using clunky JDK1.1 methods here
  +            String absPath = buildFile.getAbsolutePath();
  +            String parentPath = new File(absPath).getParent();
  +         project.setBaseDir(new File(parentPath));
        }
   
        // set up any properties that may be in the config file
  
  
  
  1.6       +5 -2     
jakarta-tools/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file:
/home/cvs/jakarta-tools/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Javac.java        1999/10/15 19:27:56     1.5
  +++ Javac.java        1999/10/18 03:03:40     1.6
  @@ -192,9 +192,12 @@
        argList.addElement(destDir.getAbsolutePath());
        argList.addElement("-classpath");
        // Just add "sourcepath" to classpath ( for JDK1.1 )
  +        // Note: SGI JDK 1.1.x has java.version of "3.1 (Sun 1.1.x)"
        String javaVersion = System.getProperty("java.version");
  -     if (javaVersion.startsWith("1.1")) {
  -         argList.addElement(classpath + File.pathSeparator +
srcDir.getAbsolutePath());
  +     if (javaVersion.startsWith("1.1") ||
  +               javaVersion.indexOf("Sun 1.1") != -1) {
  +         argList.addElement(classpath + File.pathSeparator +
  +                               srcDir.getAbsolutePath());
        } else {
            argList.addElement(classpath);
            argList.addElement("-sourcepath");

Mime
View raw message