bodewig 2004/12/21 07:49:39
Modified: src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
Jvc.java Kjc.java
Log:
Make bootclasspath construction in <javac> take build.sysclasspath
into account. Probably needs to get used in all other tasks
supporting bootclasspath as well.
Revision Changes Path
1.22 +4 -3
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
Index: Gcj.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Gcj.java 22 Nov 2004 09:23:31 -0000 1.21
+++ Gcj.java 21 Dec 2004 15:49:39 -0000 1.22
@@ -52,10 +52,11 @@
// 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);
1.22 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
Index: Jvc.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Jvc.java 9 Mar 2004 16:48:13 -0000 1.21
+++ Jvc.java 21 Dec 2004 15:49:39 -0000 1.22
@@ -43,8 +43,9 @@
// 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) {
1.19 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java
Index: Kjc.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Kjc.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Kjc.java 9 Mar 2004 16:48:13 -0000 1.18
+++ Kjc.java 21 Dec 2004 15:49:39 -0000 1.19
@@ -91,8 +91,9 @@
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
