skip on the exclude runtime test rather than patch it in the build file.

This allows the correct testing-drivers-all.jar to be built too.

diff --git a/build/build.xml b/build/build.xml
index b9c017a6d242f474b0c743b48c524631c7668af0..44cef9762e6c58842f5716f1a73591795e124890 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -372,9 +372,6 @@ To use testing client jar in tests,
        <mkdir dir="${aj.dist.dir}/tools_tmp"/>
        <unjar dest="${aj.dist.dir}/tools_tmp"
                   src="${aj.dist.dir}/tools/lib/aspectjtools.jar"/>
-       <!-- put the runtime classes in too -->
-       <unjar dest="${aj.dist.dir}/tools_tmp" 
-               src="${aj.dist.dir}/tools/lib/aspectjrt.jar"/>
        <!-- Ant 1.5.1 doesn't overwrite the jar, even with update set to false -->
        <delete file="${aj.dist.dir}/tools/lib/aspectjtools.jar" />
                <jar manifest="${aj.dist.dir}/tools_tmp/META-INF/MANIFEST.MF" 

diff --git a/build/src/org/aspectj/internal/tools/build/Module.java b/build/src/org/aspectj/internal/tools/build/Module.java
index 5cc292246f5a287f4b5dfcb26c97233b81d241e7..f61dd6345e09c86f39165345d582888475912ae9 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/Module.java
+++ b/build/src/org/aspectj/internal/tools/build/Module.java
@@ -134,7 +134,8 @@ public class Module {
         if (null == requiredJar) {
             return true;
         } else {
-            return "runtime.jar".equals(requiredJar.getName());
+            //return "runtime.jar".equals(requiredJar.getName());
+               return false;
         }
     }