Browse Source

Make bootclasspath construction in <javac> take build.sysclasspath

into account.  Probably needs to get used in all other tasks
supporting bootclasspath as well.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277260 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 20 years ago
parent
commit
39116e15ea
3 changed files with 10 additions and 7 deletions
  1. +4
    -3
      src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
  2. +3
    -2
      src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
  3. +3
    -2
      src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java

+ 4
- 3
src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java View File

@@ -52,10 +52,11 @@ public class Gcj extends DefaultCompilerAdapter {

// gcj doesn't support bootclasspath dir (-bootclasspath)
// so we'll emulate it for compatibility and convenience.
if (bootclasspath != null) {
classpath.append(bootclasspath);
Path p = getBootClassPath();
if (p.size() > 0) {
classpath.append(p);
}
// gcj doesn't support an extension dir (-extdir)
// so we'll emulate it for compatibility and convenience.
classpath.addExtdirs(extdirs);


+ 3
- 2
src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java View File

@@ -43,8 +43,9 @@ public class Jvc extends DefaultCompilerAdapter {

// jvc doesn't support bootclasspath dir (-bootclasspath)
// so we'll emulate it for compatibility and convenience.
if (bootclasspath != null) {
classpath.append(bootclasspath);
Path p = getBootClassPath();
if (p.size() > 0) {
classpath.append(p);
}

if (includeJavaRuntime) {


+ 3
- 2
src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java View File

@@ -91,8 +91,9 @@ public class Kjc extends DefaultCompilerAdapter {
Path cp = new Path(project);

// kjc don't have bootclasspath option.
if (bootclasspath != null) {
cp.append(bootclasspath);
Path p = getBootClassPath();
if (p.size() > 0) {
cp.append(p);
}

if (extdirs != null) {


Loading…
Cancel
Save