Browse Source

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.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268480 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
b3cb9a9d4f
3 changed files with 3 additions and 3 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/AntClassLoader.java
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  3. +1
    -1
      src/main/org/apache/tools/ant/types/CommandlineJava.java

+ 1
- 1
src/main/org/apache/tools/ant/AntClassLoader.java View File

@@ -111,7 +111,7 @@ public class AntClassLoader extends ClassLoader {
*/
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
- 1
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -572,7 +572,7 @@ public class Javadoc extends Task {
if (classpath == null)
classpath = Path.systemClasspath;
else
classpath = classpath.concatSystemClasspath();
classpath = classpath.concatSystemClasspath("ignore");

if (!javadoc1) {
toExecute.createArgument().setValue("-classpath");


+ 1
- 1
src/main/org/apache/tools/ant/types/CommandlineJava.java View File

@@ -190,7 +190,7 @@ public class CommandlineJava implements Cloneable {
}
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());


Loading…
Cancel
Save