ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java Jikes.java Jvc.java Kjc.java
Date Thu, 13 Jun 2002 12:13:29 GMT
bodewig     2002/06/13 05:13:29

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs/compilers Tag:
                        ANT_15_BRANCH Gcj.java Jikes.java Jvc.java Kjc.java
  Log:
  Make sourcepath handling consistent accross <javac> implementations.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.39 +8 -5      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.38
  retrieving revision 1.263.2.39
  diff -u -r1.263.2.38 -r1.263.2.39
  --- WHATSNEW	12 Jun 2002 15:31:38 -0000	1.263.2.38
  +++ WHATSNEW	13 Jun 2002 12:13:29 -0000	1.263.2.39
  @@ -32,9 +32,12 @@
   * <linecontains> filterreader could swallow lines.
   
   * <sequential> used to configure the tasks (set their attributes)
  -before the first task has been executed.  This means that properties
  -that have been set by nested task seemed to be unset for the other
  -tasks in the same <sequential> element.
  +  before the first task has been executed.  This means that properties
  +  that have been set by nested task seemed to be unset for the other
  +  tasks in the same <sequential> element.
  +
  +* <javac>'s sourcepath setting has been ignored by some compiler 
  +  implementations.
   
   Other changes:
   --------------
  @@ -42,8 +45,8 @@
   * <checksum> now uses a buffer (of configurable size).
   
   * The "Trying to override task definition" warning has been degraded
  -to verbose level if the two task definitions only differ in the class
  -loader instance that has loaded the definition.
  +  to verbose level if the two task definitions only differ in the class
  +  loader instance that has loaded the definition.
   
   Changes from Ant 1.5beta1 to Ant 1.5beta2
   =========================================
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +5 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
  
  Index: Gcj.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- Gcj.java	12 Apr 2002 14:46:45 -0000	1.10
  +++ Gcj.java	13 Jun 2002 12:13:29 -0000	1.10.2.1
  @@ -106,7 +106,11 @@
   
           // Gcj has no option for source-path so we
           // will add it to classpath.
  -        classpath.append(src);
  +        if (compileSourcepath != null) {
  +            classpath.append(compileSourcepath);
  +        } else {
  +            classpath.append(src);
  +        }
   
           cmd.setExecutable("gcj");
   
  
  
  
  1.12.2.1  +5 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- Jikes.java	15 Apr 2002 15:33:11 -0000	1.12
  +++ Jikes.java	13 Jun 2002 12:13:29 -0000	1.12.2.1
  @@ -111,7 +111,11 @@
   
           // Jikes has no option for source-path so we
           // will add it to classpath.
  -        classpath.append(src);
  +        if (compileSourcepath != null) {
  +            classpath.append(compileSourcepath);
  +        } else {
  +            classpath.append(src);
  +        }
   
           // if the user has set JIKESPATH we should add the contents as well
           String jikesPath = System.getProperty("jikes.class.path");
  
  
  
  1.9.2.1   +5 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
  
  Index: Jvc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- Jvc.java	16 Apr 2002 07:15:18 -0000	1.9
  +++ Jvc.java	13 Jun 2002 12:13:29 -0000	1.9.2.1
  @@ -106,7 +106,11 @@
   
           // jvc has no option for source-path so we
           // will add it to classpath.
  -        classpath.append(src);
  +        if (compileSourcepath != null) {
  +            classpath.append(compileSourcepath);
  +        } else {
  +            classpath.append(src);
  +        }
   
           Commandline cmd = new Commandline();
           cmd.setExecutable("jvc");
  
  
  
  1.9.2.1   +6 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
  
  Index: Kjc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- Kjc.java	16 Apr 2002 07:15:18 -0000	1.9
  +++ Kjc.java	13 Jun 2002 12:13:29 -0000	1.9.2.1
  @@ -142,8 +142,12 @@
           }
           
           cp.append(classpath);
  -        cp.append(src);
  -        
  +        if (compileSourcepath != null) {
  +            cp.append(compileSourcepath);
  +        } else {
  +            cp.append(src);
  +        }        
  +
           cmd.createArgument().setPath(cp);
           
           // kjc-1.5A doesn't support -encoding option now.
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message