fix for 130300: cause the mysterious disappearance of -XnoWeave

9 files changed, 31 insertions, 31 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
index c11e1fc59..fccb824ee 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -537,8 +537,10 @@ public class BuildArgParser extends Main {
 				buildConfig.setXdevPinpointMode(true);
         	} else if (arg.equals("-Xjoinpoints:arrayconstruction")) {
         		buildConfig.setXJoinpoints("arrayconstruction");
-        	} else if (arg.equals("-noweave") || arg.equals( "-XnoWeave")) {
-				buildConfig.setNoWeave(true);
+        	} else if (arg.equals("-noWeave") || arg.equals( "-XnoWeave")) {
+				showWarning("the noweave option is no longer required and is being ignored");
+        	} else if (arg.equals( "-XterminateAfterCompilation")) {
+				buildConfig.setTerminateAfterCompilation(true);
 			} else if (arg.equals("-XserializableAspects")) {
 				buildConfig.setXserializableAspects(true);
 			} else if (arg.equals("-XlazyTjp")) {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index 3feed9b3d..a0ad4ca8e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -129,8 +129,7 @@ xoption.usage = {0} non-standard options:\n\
 \t-XnotReweavable     create class files that can't be subsequently rewoven\n\
 \t                    by AspectJ.\n\
 \t-XserializableAspects allows aspects to implement serializable\n\
-\t-XnoWeave           compile classes but do not weave. Deprecated, use\n\
-\t                    reweavable instead.\n\
+\t-XterminateAfterCompilation compile classes then terminate before weaving\n\
 \t-Xajruntimelevel:<level> allows code to be generated that targets\n\
 \t                    a 1.2 or a 1.5 level AspectJ runtime (default 1.5)\n\
 \t-XhasMember         allow hasmethod() and hasfield type patterns in\n\
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
index 5f23ed8b5..dcb142d21 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
@@ -30,7 +30,7 @@ public class AspectJCore extends JavaCore {
 	public static final String COMPILER_PB_NEED_SERIAL_VERSION_UID     = AjCompilerOptions.OPTION_ReportNeedSerialVersionUIDField;
 	public static final String COMPILER_PB_INCOMPATIBLE_SERIAL_VERSION = AjCompilerOptions.OPTION_ReportIncompatibleSerialVersion;
 	
-	public static final String COMPILER_NO_WEAVE             = AjCompilerOptions.OPTION_NoWeave;
+	public static final String COMPILER_TERMINATE_AFTER_COMPILATION             = AjCompilerOptions.OPTION_TerminateAfterCompilation;
 	public static final String COMPILER_SERIALIZABLE_ASPECTS = AjCompilerOptions.OPTION_XSerializableAspects;
 	public static final String COMPILER_LAZY_TJP             = AjCompilerOptions.OPTION_XLazyThisJoinPoint;
 	public static final String COMPILER_NO_ADVICE_INLINE     = AjCompilerOptions.OPTION_XNoInline;
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
index 85c7c44a4..22794ba3e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/AjCompilerAdapter.java
@@ -48,7 +48,7 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 	private EclipseFactory eWorld;
 	private boolean isBatchCompile;
 	private boolean reportedErrors;
-	private boolean isXNoWeave;
+	private boolean isXTerminateAfterCompilation;
 	private boolean proceedOnError;
 	private boolean inJava5Mode;
 	private boolean noAtAspectJAnnotationProcessing;
@@ -81,7 +81,6 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 	 * @param resultSetForFullWeave if we are doing an incremental build, and the weaver determines
 	 *                              that we need to weave the world, this is the set of intermediate
 	 *                              results that will be passed to the weaver.
-	 * @param isXNoWeave
 	 */
 	public AjCompilerAdapter(Compiler compiler,
 							 boolean isBatchCompile,
@@ -93,7 +92,7 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 							 IOutputClassFileNameProvider outputFileNameProvider,
 							 IBinarySourceProvider binarySourceProvider,
 							 Map fullBinarySourceEntries, /* fileName |-> List<UnwovenClassFile> */
-							 boolean isXNoWeave,
+							 boolean isXterminateAfterCompilation,
 							 boolean proceedOnError,
 							 boolean noAtAspectJProcessing,
 							 AjState incrementalCompilationState) {
@@ -104,7 +103,7 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 		this.progressListener = progressListener;
 		this.outputFileNameProvider = outputFileNameProvider;
 		this.binarySourceProvider = binarySourceProvider;
-		this.isXNoWeave = isXNoWeave;
+		this.isXTerminateAfterCompilation = isXterminateAfterCompilation;
 		this.proceedOnError = proceedOnError;
 		this.binarySourceSetForFullWeave = fullBinarySourceEntries;
 		this.eWorld = eFactory;
@@ -177,7 +176,7 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 	public void afterCompiling(CompilationUnitDeclaration[] units) {
 		this.eWorld.cleanup();
 		try {
-			if (isXNoWeave || (reportedErrors && !proceedOnError)) {
+			if (isXTerminateAfterCompilation || (reportedErrors && !proceedOnError)) {
 				// no point weaving... just tell the requestor we're done
 				notifyRequestor();
 			} else {
@@ -207,7 +206,7 @@ public class AjCompilerAdapter implements ICompilerAdapter {
 			intermediateResultsRequestor.acceptResult(intRes);
 		}
 		
-		if (isXNoWeave) {
+		if (isXTerminateAfterCompilation) {
 			acceptResult(unit.compilationResult);
 		} else {
 			resultsPendingWeave.add(intRes);
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 9bf4e865b..d41b146f8 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -354,8 +354,8 @@ public class AjBuildConfig {
         if (null == lintSpecFile) {
             lintSpecFile = global.lintSpecFile;
         }
-        if (!isNoWeave() && global.isNoWeave()) {
-            setNoWeave(true);
+        if (!isTerminateAfterCompilation() && global.isTerminateAfterCompilation()) {
+            setTerminateAfterCompilation(true);
         }
         if ((null == outputDir) && (null == outputJar)) {
             if (null != global.outputDir) {
@@ -456,12 +456,12 @@ public class AjBuildConfig {
 		}
 	}
 	
-	public boolean isNoWeave() {
-		return options.noWeave;
+	public boolean isTerminateAfterCompilation() {
+		return options.terminateAfterCompilation;
 	}
 
-	public void setNoWeave(boolean noWeave) {
-		options.noWeave = noWeave;
+	public void setTerminateAfterCompilation(boolean b) {
+		options.terminateAfterCompilation = b;
 	}
 
 	public boolean isXserializableAspects() {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 3b68dc315..d2a7e88c8 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -1157,7 +1157,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
 						this,  // IOutputFilenameProvider
 						this,  // IBinarySourceProvider
 						state.getBinarySourceMap(),
-						buildConfig.isNoWeave(),
+						buildConfig.isTerminateAfterCompilation(),
 						buildConfig.getProceedOnError(),
 						buildConfig.isNoAtAspectJAnnotationProcessing(),
 						state);
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
index 636772c00..54a271c27 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
@@ -37,7 +37,7 @@ public class AjCompilerOptions extends CompilerOptions {
 	public static final String OPTION_ReportIncompatibleSerialVersion   = "org.aspectj.ajdt.core.compiler.lint.BrokeSerialVersionCompatibility";
 	
 	// General AspectJ Compiler options (excludes paths etc, these are handled separately)
-	public static final String OPTION_NoWeave                 = "org.aspectj.ajdt.core.compiler.weaver.NoWeave";
+	public static final String OPTION_TerminateAfterCompilation                 = "org.aspectj.ajdt.core.compiler.weaver.TerminateAfterCompilation";
 	public static final String OPTION_XSerializableAspects    = "org.aspectj.ajdt.core.compiler.weaver.XSerializableAspects";
 	public static final String OPTION_XLazyThisJoinPoint      = "org.aspectj.ajdt.core.compiler.weaver.XLazyThisJoinPoint";
 	public static final String OPTION_XNoInline               = "org.aspectj.ajdt.core.compiler.weaver.XNoInline";
@@ -62,7 +62,7 @@ public class AjCompilerOptions extends CompilerOptions {
 	public static final long NeedSerialVersionUIDField  = ASTNode.Bit54L;
 	public static final long IncompatibleSerialVersion  = ASTNode.Bit55L;
 
-	public boolean noWeave = false;
+	public boolean terminateAfterCompilation = false;
 	public boolean xSerializableAspects = false;
 	public boolean xLazyThisJoinPoint = false;
 	public boolean xNoInline = false;
@@ -130,7 +130,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		map.put(OPTION_ReportIncompatibleSerialVersion,getSeverityString(IncompatibleSerialVersion));
 		map.put(CompilerOptions.OPTION_ReportSwallowedExceptionInCatchBlock,getSeverityString(CompilerOptions.SwallowedExceptionInCatchBlock));
 		
-		map.put(OPTION_NoWeave, this.noWeave ? ENABLED : DISABLED);
+		map.put(OPTION_TerminateAfterCompilation, this.terminateAfterCompilation ? ENABLED : DISABLED);
 		map.put(OPTION_XSerializableAspects,this.xSerializableAspects ? ENABLED : DISABLED);
 		map.put(OPTION_XLazyThisJoinPoint,this.xLazyThisJoinPoint ? ENABLED : DISABLED);
 		map.put(OPTION_XNoInline,this.xNoInline ? ENABLED : DISABLED);
@@ -163,11 +163,11 @@ public class AjCompilerOptions extends CompilerOptions {
 		if ((optionValue = optionsMap.get(OPTION_ReportIncompatibleSerialVersion)) != null) updateSeverity(IncompatibleSerialVersion, optionValue);
 		if ((optionValue = optionsMap.get(CompilerOptions.OPTION_ReportSwallowedExceptionInCatchBlock)) != null) updateSeverity(CompilerOptions.SwallowedExceptionInCatchBlock, optionValue);
 		
-		if ((optionValue = optionsMap.get(OPTION_NoWeave)) != null) {
+		if ((optionValue = optionsMap.get(OPTION_TerminateAfterCompilation)) != null) {
 			if (ENABLED.equals(optionValue)) {
-				this.noWeave = true;
+				this.terminateAfterCompilation = true;
 			} else if (DISABLED.equals(optionValue)) {
-				this.noWeave = false;
+				this.terminateAfterCompilation = false;
 			}
 		}
 		if ((optionValue = optionsMap.get(OPTION_XSerializableAspects)) != null) {
@@ -278,7 +278,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		StringBuffer buf = new StringBuffer( super.toString() );
 		// now add AspectJ additional options
 		buf.append("\n\tAspectJ Specific Options:");
-		buf.append("\n\t- no weave: ").append(this.noWeave ? ENABLED : DISABLED); //$NON-NLS-1$
+		buf.append("\n\t- terminate after compilation: ").append(this.terminateAfterCompilation ? ENABLED : DISABLED); //$NON-NLS-1$
 		buf.append("\n\t- no inline (X option): ").append(this.xNoInline ? ENABLED : DISABLED); //$NON-NLS-1$
 		buf.append("\n\t- generate serializable aspects (X option): ").append(this.xSerializableAspects ? ENABLED : DISABLED); //$NON-NLS-1$
 		buf.append("\n\t- lazy thisJoinPoint (X option): ").append(this.xLazyThisJoinPoint ? ENABLED : DISABLED); //$NON-NLS-1$
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
index cdf3c21cf..e7df64e4a 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BcweaverJarMaker.java
@@ -111,7 +111,7 @@ public class BcweaverJarMaker {
 		args.add("-outjar");
 		args.add("../weaver/testdata/megatraceNoweave.jar");
 
-		args.add("-noweave");
+		args.add("-XterminateAfterCompilation");
 
 		args.add("-classpath");
         args.add(AjcTests.aspectjrtClasspath());
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java
index ebd5dd385..3916a3443 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjCompilerOptionsTest.java
@@ -36,7 +36,7 @@ public class AjCompilerOptionsTest extends TestCase {
 	}
 	
 	public void testDefaultValues() {
-		assertFalse(options.noWeave);
+		assertFalse(options.terminateAfterCompilation);
 		assertFalse(options.xSerializableAspects);
 		assertFalse(options.xLazyThisJoinPoint);
 		assertFalse(options.xNoInline);
@@ -59,7 +59,7 @@ public class AjCompilerOptionsTest extends TestCase {
 	}
 	
 	public void testDirectSet() {
-		options.noWeave = true;
+		options.terminateAfterCompilation = true;
 		options.xSerializableAspects = true;
 		options.xLazyThisJoinPoint = true;
 		options.xNoInline = true;
@@ -70,7 +70,7 @@ public class AjCompilerOptionsTest extends TestCase {
 		options.noAtAspectJProcessing = true;
 
 		Map map = options.getMap();
-		assertEquals(CompilerOptions.ENABLED,map.get(AjCompilerOptions.OPTION_NoWeave));
+		assertEquals(CompilerOptions.ENABLED,map.get(AjCompilerOptions.OPTION_TerminateAfterCompilation));
 		assertEquals(CompilerOptions.ENABLED,map.get(AjCompilerOptions.OPTION_XSerializableAspects));
 		assertEquals(CompilerOptions.ENABLED,map.get(AjCompilerOptions.OPTION_XLazyThisJoinPoint));
 		assertEquals(CompilerOptions.ENABLED,map.get(AjCompilerOptions.OPTION_XNoInline));
@@ -94,7 +94,7 @@ public class AjCompilerOptionsTest extends TestCase {
 		map.put(AjCompilerOptions.OPTION_ReportNeedSerialVersionUIDField,CompilerOptions.WARNING);
 		map.put(AjCompilerOptions.OPTION_ReportIncompatibleSerialVersion,CompilerOptions.ERROR);
 		
-		map.put(AjCompilerOptions.OPTION_NoWeave,CompilerOptions.ENABLED);
+		map.put(AjCompilerOptions.OPTION_TerminateAfterCompilation,CompilerOptions.ENABLED);
 		map.put(AjCompilerOptions.OPTION_XSerializableAspects,CompilerOptions.ENABLED);
 		map.put(AjCompilerOptions.OPTION_XLazyThisJoinPoint,CompilerOptions.ENABLED);
 		map.put(AjCompilerOptions.OPTION_XNoInline,CompilerOptions.ENABLED);
@@ -106,7 +106,7 @@ public class AjCompilerOptionsTest extends TestCase {
 		
 		options.set(map);
 		
-		assertTrue(options.noWeave);
+		assertTrue(options.terminateAfterCompilation);
 		assertTrue(options.xSerializableAspects);
 		assertTrue(options.xLazyThisJoinPoint);
 		assertTrue(options.xNoInline);