bodewig 2004/12/07 07:55:40
Modified: src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Jikes.java
Log:
merge
Revision Changes Path
No revision
No revision
1.22.2.5 +8 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -r1.22.2.4 -r1.22.2.5
--- Jikes.java 9 Mar 2004 17:01:38 -0000 1.22.2.4
+++ Jikes.java 7 Dec 2004 15:55:39 -0000 1.22.2.5
@@ -186,7 +186,14 @@
if (attributes.getSource() != null) {
cmd.createArgument().setValue("-source");
- cmd.createArgument().setValue(attributes.getSource());
+ String source = attributes.getSource();
+ 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, Jikes doesn't like it
+ cmd.createArgument().setValue("1.3");
+ } else {
+ cmd.createArgument().setValue(source);
+ }
}
addCurrentCompilerArgs(cmd);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
