support for building the org.aspectj.aspectjrt plugin

diff --git a/build/build-properties.xml b/build/build-properties.xml
index 326a6d059220721daa251b697826392060d3d9e7..69c8f2a3e76536faed4a2550959bde3c0b51d44a 100644 (file)
--- a/build/build-properties.xml
+++ b/build/build-properties.xml
@@ -71,6 +71,8 @@
             location="${aj.build.dir}/webDeploy"/>
       <property name="aj.plugin.org.aspectj.ajde.dir" 
             location="${aj.dist.dir}/ide/eclipse/org.aspectj.ajde"/>
+      <property name="aj.plugin.org.aspectj.aspectjrt.dir" 
+            location="${aj.dist.dir}/ide/eclipse/org.aspectj.aspectjrt"/>
       <property name="aj.plugin.org.aspectj.ajde.source.dir" 
             location="${aj.dist.dir}/ide/eclipse/org.aspectj.ajde.source"/>
       <property name="aj.plugin.org.aspectj.ajde.doc.dir" 

diff --git a/build/build.xml b/build/build.xml
index b6502124e3c1c30a3b815595dc53b428f22cd1fe..03438a66cbc608cd98d7a0cbe2627bda1eee1cd3 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -15,7 +15,7 @@
 <!-- ========================================================================= -->
 
 <!DOCTYPE project [
-<!ENTITY build-properties SYSTEM "file:build-properties.xml">
+<!ENTITY build-properties SYSTEM "build-properties.xml">
 ]>
 <project name="build" default="all" basedir=".">
 
@@ -361,7 +361,8 @@ To use testing client jar in tests,
 
        <target name="eclipse.plugins" depends="org.aspectj.ajde.source,
                                                org.aspectj.ajde.doc,
-                                               org.aspectj.ajde"
+                                               org.aspectj.ajde,
+                                               org.aspectj.aspectjrt"
            description="create the Eclipse distribution plugins"/>       
 
        <target name="org.aspectj.ajde.source" depends="init"
@@ -427,5 +428,20 @@ To use testing client jar in tests,
          </jar>
        </target>
 
+       <target name="org.aspectj.aspectjrt" depends="init,aspectj"
+         description="build the AspectJ runtime library plugin for Eclipse">
+         <copy todir="${aj.plugin.org.aspectj.aspectjrt.dir}">
+           <fileset dir="${aspectj.modules.dir}/eclipse.plugin/org.aspectj.aspectjrt"/>
+         </copy>         
+         <replace file="${aj.plugin.org.aspectj.aspectjrt.dir}/plugin.xml"
+                  token="build.version.eclipse.plugins"
+                  value="${build.version.eclipse.plugins}"/>
+         <copy file="${aj.dist.dir}/tools/lib/aspectjrt.jar"
+               todir="${aj.plugin.org.aspectj.aspectjrt.dir}"/> 
+         <jar destfile="${aj.plugin.org.aspectj.aspectjrt.dir}/../org.aspectj.aspectjrt_${build.version.eclipse.plugins}.jar">
+           <fileset dir="${aj.plugin.org.aspectj.aspectjrt.dir}" includes="**"/>           
+         </jar>
+       </target>
+
 </project>