You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@apache.org on 2001/01/19 14:27:01 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types CommandlineJava.java
bodewig 01/01/19 05:27:01
Modified: src/main/org/apache/tools/ant AntClassLoader.java
src/main/org/apache/tools/ant/taskdefs Javadoc.java
src/main/org/apache/tools/ant/types CommandlineJava.java
Log:
Changed the handling of build.sysclasspath so that Ant should behave
the same way as Ant 1.2 did - if build.sysclasspath has not been set.
Revision Changes Path
1.13 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AntClassLoader.java 2001/01/05 14:26:24 1.12
+++ AntClassLoader.java 2001/01/19 13:27:00 1.13
@@ -111,7 +111,7 @@
*/
public AntClassLoader(Project project, Path classpath) {
this.project = project;
- this.classpath = classpath.concatSystemClasspath();
+ this.classpath = classpath.concatSystemClasspath("ignore");
// JDK > 1.1 should add these by default, but some VMs don't
addSystemPackageRoot("java");
1.40 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Javadoc.java 2001/01/05 14:26:26 1.39
+++ Javadoc.java 2001/01/19 13:27:00 1.40
@@ -572,7 +572,7 @@
if (classpath == null)
classpath = Path.systemClasspath;
else
- classpath = classpath.concatSystemClasspath();
+ classpath = classpath.concatSystemClasspath("ignore");
if (!javadoc1) {
toExecute.createArgument().setValue("-classpath");
1.9 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CommandlineJava.java 2001/01/05 14:26:27 1.8
+++ CommandlineJava.java 2001/01/19 13:27:00 1.9
@@ -190,7 +190,7 @@
}
if (classpath != null && classpath.size() > 0) {
result[pos++] = "-classpath";
- result[pos++] = classpath.concatSystemClasspath().toString();
+ result[pos++] = classpath.concatSystemClasspath("ignore").toString();
}
System.arraycopy(javaCommand.getCommandline(), 0,
result, pos, javaCommand.size());