From: acolyer <acolyer>
Date: Wed, 2 Jun 2004 12:09:36 +0000 (+0000)
Subject: add direct support for reweavable, reweavable:compress and noInline in X options
X-Git-Tag: for_ajdt1_1_12~140
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bace19245b7363da6c2c1ba32ca46c14c68b532b;p=aspectj.git

add direct support for reweavable, reweavable:compress and noInline in X options
---

diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index f0cd6087c..c049aee5f 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -255,7 +255,8 @@ public class AjcTask extends MatchingTask {
             
     static {
         String[] xs = new String[] 
-            {   "serializableAspects", "incrementalFile", "lazyTjp"
+            {   "serializableAspects", "incrementalFile", "lazyTjp",
+        		"reweavable", "reweavable:compress", "noInline"
             	//, "targetNearSource", "OcodeSize",
                  };
         VALID_XOPTIONS = Collections.unmodifiableList(Arrays.asList(xs));
diff --git a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
index 42feeb5a7..96618a708 100644
--- a/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
+++ b/taskdefs/testsrc/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java
@@ -521,6 +521,23 @@ public class AjcTaskTest extends TestCase {
 		runTest(task, NO_EXCEPTION, MessageHolderChecker.INFOS);
 	}
 
+	public void testXOptions() {
+		String[] xopts = new String[] {
+			"serializableAspects",
+			"lazyTjp",
+			"reweavable",
+			"reweavable:compress",
+			"noInline"
+		};
+		for (int i = 0; i < xopts.length; i++) {
+			AjcTask task = getTask(NOFILE);
+			task.setX(xopts[i]);
+			String[] cmd = task.makeCommand();
+			checkContains(cmd,"-X" + xopts[i],true);
+		}
+		
+	}
+	
 	protected void runTest(
 		AjcTask task,
 		Class exceptionType,