diff options
| author | wisberg <wisberg> | 2003-05-25 13:42:08 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2003-05-25 13:42:08 +0000 |
| commit | c42224c41b7e8a8a7212fd55f5d5caea8cb1c76d (patch) | |
| tree | 90402944714856d17e16c4ab7bbd80cbcd175a24 /taskdefs | |
| parent | 9bf93f948ce3413eddcb4fffad6daed5a416f628 (diff) | |
| download | aspectj-c42224c41b7e8a8a7212fd55f5d5caea8cb1c76d.tar.gz aspectj-c42224c41b7e8a8a7212fd55f5d5caea8cb1c76d.zip | |
fixing 2 bugs disclosed by running ajcTests.xml with -ajctaskCompiler: (1) compliance set incorrectly (-1.3 instead of 1.4) and (2) warn:... form was ignored.
These would break only when running from a Javac compiler adapter and using <compilerarg>
Diffstat (limited to 'taskdefs')
| -rw-r--r-- | taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java index 99a65ed10..f2b57fab3 100644 --- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java +++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java @@ -334,6 +334,7 @@ public class AjcTask extends MatchingTask { /** true if -XincrementalFile (i.e, setTagFile)*/ private boolean inIncrementalFileMode; + // also note MatchingTask grabs source files... public AjcTask() { @@ -596,6 +597,8 @@ public class AjcTask extends MatchingTask { cmd.addFlag("-1.3", true); } else if ("1.4".equals(either13or14)) { cmd.addFlag("-1.4", true); +// } else if ("1.5".equals(either13or14)) { +// cmd.addFlag("-1.5", true); } else if (null != either13or14) { ignore(either13or14 + "[compliance]"); } @@ -1414,9 +1417,11 @@ public class AjcTask extends MatchingTask { while (in.hasNext()) { flag = in.next(); if ("-1.3".equals(flag)) { - setCompliance(flag); + setCompliance("1.3"); } else if ("-1.4".equals(flag)) { - setCompliance(flag); + setCompliance("1.4"); +// } else if ("-1.5".equals(flag)) { +// setCompliance("1.5"); } else if ("-argfile".equals(flag)) { setArgfiles(new Path(project, in.next())); } else if ("-aspectpath".equals(flag)) { @@ -1499,6 +1504,8 @@ public class AjcTask extends MatchingTask { setVersion(true); } else if ("-warn".equals(flag)) { setWarn(in.next()); + } else if (flag.startsWith("-warn:")) { + setWarn(flag.substring(6)); } else if ("-Xlint".equals(flag)) { setXlintwarnings(true); } else if (flag.startsWith("-Xlint:")) { |