bodewig 2005/01/13 01:25:29
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers
JavacExternal.java
Log:
JDK 1.2's javac doesn't understand -source if forked, either - PR 32948
Revision Changes Path
1.711 +4 -1 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -r1.710 -r1.711
--- WHATSNEW 13 Jan 2005 09:05:35 -0000 1.710
+++ WHATSNEW 13 Jan 2005 09:25:26 -0000 1.711
@@ -239,7 +239,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
===================================
1.18 +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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JavacExternal.java 22 Nov 2004 09:23:31 -0000 1.17
+++ JavacExternal.java 13 Jan 2005 09:25:28 -0000 1.18
@@ -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.
@@ -42,7 +42,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);
//On VMS platform, we need to create a special java options file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
