add the runtime classes into aspectjtools.jar. needed because of

static dependency from weaver classes to runtime classes.
Better than alternative of updating all ant scripts that fork and
the ajc compiler scripts to add aspectjrt.jar into path.

diff --git a/build/build.xml b/build/build.xml
index 44cef9762e6c58842f5716f1a73591795e124890..b9c017a6d242f474b0c743b48c524631c7668af0 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -372,6 +372,9 @@ 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"