diff options
| author | aclement <aclement> | 2006-03-05 17:00:04 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2006-03-05 17:00:04 +0000 |
| commit | b2259116b8731725743d255a85c894d6f998afb1 (patch) | |
| tree | edf9876f501cd6f8a35107c8da10a9fd72b7de7f /taskdefs/src | |
| parent | 1954377011ba95d032e7076ea37623a4c22020ac (diff) | |
| download | aspectj-b2259116b8731725743d255a85c894d6f998afb1.tar.gz aspectj-b2259116b8731725743d255a85c894d6f998afb1.zip | |
fix for 130300: cause the mysterious disappearance of -XnoWeave
Diffstat (limited to 'taskdefs/src')
| -rw-r--r-- | taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java index fd691104a..02f1933a3 100644 --- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java +++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java @@ -288,11 +288,11 @@ public class AjcTask extends MatchingTask { private static final ICommandEditor COMMAND_EDITOR; static { - // many now deprecated: reweavable*, noWeave, ... + // many now deprecated: reweavable* String[] xs = new String[] { "serializableAspects", "incrementalFile", "lazyTjp", "reweavable", "reweavable:compress", "notReweavable", "noInline", - "noWeave","hasMember", + "terminateAfterCompilation","hasMember", "ajruntimelevel:1.2", "ajruntimelevel:1.5", //, "targetNearSource", "OcodeSize", @@ -502,14 +502,22 @@ public class AjcTask extends MatchingTask { cmd.addFlag("-version", version); } - public void setXNoweave(boolean noweave) { - cmd.addFlag("-XnoWeave", noweave); + public void setXTerminateAfterCompilation(boolean b) { + cmd.addFlag("-XterminateAfterCompilation", b); } public void setXReweavable(boolean reweavable) { cmd.addFlag("-Xreweavable",reweavable); } + public void setXNoWeave(boolean b) { + if (logger!=null) logger.warning("the noweave option is no longer required and is being ignored"); + } + + public void setNoWeave(boolean b) { + if (logger!=null) logger.warning("the noweave option is no longer required and is being ignored"); + } + public void setXNotReweavable(boolean notReweavable) { cmd.addFlag("-XnotReweavable",notReweavable); } @@ -1882,8 +1890,8 @@ public class AjcTask extends MatchingTask { setXlint(flag.substring(7)); } else if ("-Xlintfile".equals(flag)) { setXlintfile(new File(in.next())); - } else if ("-Xnoweave".equals(flag)) { - setXNoweave(true); + } else if ("-XterminateAfterCompilation".equals(flag)) { + setXTerminateAfterCompilation(true); } else if ("-Xreweavable".equals(flag)) { setXReweavable(true); } else if ("-XnotReweavable".equals(flag)) { |