Author: bodewig
Date: Tue Apr 17 21:17:52 2007
New Revision: 529855
URL: http://svn.apache.org/viewvc?view=rev&rev=529855
Log:
Java 6's javac doesn't understand -source 1.1 either (found by Gump and the
log4j build
<http://gump.zones.apache.org/gump/test/logging-log4j-12/logging-log4j-12/gump_work/build_logging-log4j-12_logging-log4j-12.html>)
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java?view=diff&rev=529855&r1=529854&r2=529855
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Tue Apr 17 21:17:52 2007
@@ -321,10 +321,10 @@
if (attributes.getSource() != null && !assumeJava13()) {
cmd.createArgument().setValue("-source");
String source = attributes.getSource();
- if ((assumeJava14() || assumeJava15())
- && (source.equals("1.1") || source.equals("1.2"))) {
+ if (source.equals("1.1") || source.equals("1.2")) {
// support for -source 1.1 and -source 1.2 has been
- // added with JDK 1.4.2 - and isn't present in 1.5.0 either
+ // added with JDK 1.4.2 - and isn't present in 1.5.0
+ // or 1.6.0 either
cmd.createArgument().setValue("1.3");
} else {
cmd.createArgument().setValue(source);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
