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 f0cd6087c14d7e2ee01db2664d127bf026ea90c1..c049aee5f10711625b75e111bf26c847ee377abf 100644 (file)
--- 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 42feeb5a710fb2016e2483874340d5fb73cc043d..96618a708f6980e9731c2d4fd0c1d36e16dd5fe9 100644 (file)
--- 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,