cope (not perfect) with recent change to containers in AJDT projects.

diff --git a/build/src/org/aspectj/internal/tools/build/Module.java b/build/src/org/aspectj/internal/tools/build/Module.java
index 177ab26a6d830f81b345416266579760710de49c..02209e22e1413b4eab1744446b225199fd06644a 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/Module.java
+++ b/build/src/org/aspectj/internal/tools/build/Module.java
@@ -441,9 +441,14 @@ public class Module {
                 classpathVariables.add(path);
             }
         } else if ("con".equals(kind)) {
-            if (-1 == path.indexOf("JRE")) { // warn non-JRE containers
-                messager.log("cannot handle con yet: " + toString);
-            }
+               // 'special' for container pointing at AspectJ runtime...
+               if (path.equals("org.eclipse.ajdt.core.ASPECTJRT_CONTAINER")) {
+                       classpathVariables.add("ASPECTJRT_LIB");
+               } else {
+                   if (-1 == path.indexOf("JRE")) { // warn non-JRE containers
+                       messager.log("cannot handle con yet: " + toString);
+                   }
+               }
         } else if ("out".equals(kind) || "output".equals(kind)) {
             // ignore output entries
         } else {

diff --git a/lib/build/build.jar b/lib/build/build.jar
index f956b1ecada63e4641c26e1dd0d7d2e710406787..870133dfacf725f71f4044bd6407f40e4688577d 100644 (file)
Binary files a/lib/build/build.jar and b/lib/build/build.jar differ