bodewig 2004/10/28 00:59:31
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Javac.java
Log:
merge
Revision Changes Path
No revision
No revision
1.115.2.8 +4 -2 ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.115.2.7
retrieving revision 1.115.2.8
diff -u -r1.115.2.7 -r1.115.2.8
--- Javac.java 26 Oct 2004 14:19:14 -0000 1.115.2.7
+++ Javac.java 28 Oct 2004 07:59:30 -0000 1.115.2.8
@@ -849,7 +849,9 @@
public String getCompiler() {
String compilerImpl = getCompilerVersion();
if (fork) {
- if (!isJdkCompiler(compilerImpl)) {
+ if (isJdkCompiler(compilerImpl)) {
+ compilerImpl = "extJavac";
+ } else {
log("Since compiler setting isn't classic or modern,"
+ "ignoring fork setting.", Project.MSG_WARN);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
