bodewig 2005/01/13 01:27:51
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH JavacExternal.java
Log:
merge
Revision Changes Path
No revision
No revision
1.503.2.158 +4 -1 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.157
retrieving revision 1.503.2.158
diff -u -r1.503.2.157 -r1.503.2.158
--- WHATSNEW 11 Jan 2005 18:31:12 -0000 1.503.2.157
+++ WHATSNEW 13 Jan 2005 09:27:51 -0000 1.503.2.158
@@ -118,7 +118,10 @@
Bugzilla report 32667
* untar would go into infinite loop for some invalid tar files.
- Bugzill report 29877
+ Bugzilla report 29877
+
+* forked <javac> won't pass -source to a JDK 1.1 or 1.2 javac anymore.
+ Bugzilla report 32948
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
No revision
No revision
1.11.2.5 +6 -2
ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java
Index: JavacExternal.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/JavacExternal.java,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- JavacExternal.java 9 Mar 2004 17:01:38 -0000 1.11.2.4
+++ JavacExternal.java 13 Jan 2005 09:27:51 -0000 1.11.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,11 @@
Commandline cmd = new Commandline();
cmd.setExecutable(getJavac().getJavacExecutable());
- setupModernJavacCommandlineSwitches(cmd);
+ if (!assumeJava11() && !assumeJava12()) {
+ setupModernJavacCommandlineSwitches(cmd);
+ } else {
+ setupJavacCommandlineSwitches(cmd, true);
+ }
int firstFileName = assumeJava11() ? -1 : cmd.size();
logAndAddFilesToCompile(cmd);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
