bodewig 01/01/09 04:24:54
Modified: src/main/org/apache/tools/ant/taskdefs Javac.java Rmic.java
Log:
Propagate Sam's build.sysclasspath magic to <rmic> as well.
Revision Changes Path
1.63 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Javac.java 2001/01/05 14:26:25 1.62
+++ Javac.java 2001/01/09 12:24:50 1.63
@@ -414,7 +414,7 @@
classpath.setLocation(destDir);
}
- // Compine the build classpath with the system classpath, in an
+ // Combine the build classpath with the system classpath, in an
// order determined by the value of build.classpath
if (compileClasspath == null) {
1.17 +6 -7
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
Index: Rmic.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Rmic.java 2000/11/29 16:01:53 1.16
+++ Rmic.java 2001/01/09 12:24:51 1.17
@@ -357,14 +357,13 @@
// untouched classes are on classpath
Path classpath = new Path(project, baseFile.getAbsolutePath());
- // add our classpath to the mix
-
- if (compileClasspath != null) {
- classpath.addExisting(compileClasspath);
+ // Combine the build classpath with the system classpath, in an
+ // order determined by the value of build.classpath
+ if (compileClasspath == null) {
+ classpath.addExisting(Path.systemClasspath);
+ } else {
+ classpath.addExisting(compileClasspath.concatSystemClasspath());
}
-
- // add the system classpath
- classpath.addExisting(Path.systemClasspath);
// in jdk 1.2, the system classes are not on the visible classpath.
if (Project.getJavaVersion().startsWith("1.2")) {
