fix for 130300: cause the mysterious disappearance of -XnoWeave

2 files changed, 15 insertions, 7 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)) {
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
index 716125db1..1545d52b2 100644
--- a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
+++ b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
@@ -714,7 +714,7 @@ public class AjcTaskTest extends TestCase {
 		task.setNoExit(true); // ok to override Ant?
 		task.setNoImportError(true);
 		task.setNowarn(true);
-		task.setXNoweave(true);
+		task.setXTerminateAfterCompilation(true);
 		task.setPreserveAllLocals(true);
 		task.setProceedOnError(true);
 		task.setReferenceInfo(true);