changes to build script to create aspectj eclipse plugins as part

of an aspectj build. Results are placed in:
aj-build/dist/ide/eclipse/xxxxx

diff --git a/build/build-properties.xml b/build/build-properties.xml
index 6f7c6db2851c5d066dd78347e05f1f19aea4be16..c9ff770f1c6d292bc2da32585aa1aa281f7abe47 100644 (file)
--- a/build/build-properties.xml
+++ b/build/build-properties.xml
@@ -1,6 +1,7 @@
 <!-- -*- Mode: SGML; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-     -->
 <!-- ========================================================================= -->
 <!-- Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).        -->
+<!-- Copyright (c) 2003 Contributors.                                          -->
 <!-- All rights reserved.                                                      -->
 <!-- This program and the accompanying materials are made available            -->
 <!-- under the terms of the Common Public License v1.0                         -->
@@ -8,7 +9,8 @@
 <!-- http://www.eclipse.org/legal/cpl-v10.html                                 -->
 <!--                                                                           -->
 <!-- Contributors:                                                             -->
-<!--     Xerox/PARC     initial implementation                                 -->
+<!--     Xerox/PARC             initial implementation                         -->
+<!--     A Colyer / G Harley    eclipse plugin dirs                            -->
 <!-- ========================================================================= -->
 
 <!-- include as common entity for module build scripts -->
@@ -24,11 +26,14 @@
          they should be (e.g.,) 1.1b3 or 1.1beta3
        - Changing version here causes org/aspectj/bridge/Version.java to be updated
         - also change org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+        - build.version.eclipse.plugins should be set to "9.9.9" for "DEVELOPMENT", and
+        - the same as build.version.long (in major.minor.service form) for releases.
       -->
       <property name="build.version"       value="DEVELOPMENT"/> 
       <property name="build.version.base"  value="1.1"/> 
       <property name="build.version.long"  value="DEVELOPMENT"/> 
       <property name="build.version.short" value="DEVELOPMENT"/> 
+      <property name="build.version.eclipse.plugins" value="9.9.9"/>
 
       <!-- formats comply with SimpleDateFormat -->
       <property name="build.time.format"   value="MM/dd/yy 'at' hh:mm:ss z"/> 
@@ -64,6 +69,12 @@
             location="${aj.build.dir}/dist"/>
       <property name="aj.webDeploy.dir" 
             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.ajde.source.dir" 
+            location="${aj.dist.dir}/ide/eclipse/org.aspectj.ajde.source"/>
+      <property name="aj.plugin.org.aspectj.ajde.doc.dir" 
+            location="${aj.dist.dir}/ide/eclipse/org.aspectj.ajde.doc"/>
 
          <!-- aspectj... names are sources, not to be mutated -->
       <property name="aspectj.modules.lib.dir"
@@ -108,6 +119,9 @@
       <mkdir dir="${aj.temp.dir}" />
       <mkdir dir="${aj.jar.dir}" />
       <mkdir dir="${aj.dist.dir}" />
+      <mkdir dir="${aj.plugin.org.aspectj.ajde.dir}" />
+      <mkdir dir="${aj.plugin.org.aspectj.ajde.source.dir}" />
+      <mkdir dir="${aj.plugin.org.aspectj.ajde.doc.dir}" />
       <property name="init-directories.done" value="done"/>
     </target>
 

diff --git a/build/build.xml b/build/build.xml
index f238a5e3aa9e8934f0bb86e61e10a3df847de0eb..89eb403df1c3414b1f316a1dc31f4856cb044bb6 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,7 +1,8 @@
 <!-- -*- Mode: SGML; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
 
 <!-- ========================================================================= -->
-<!-- Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).        -->
+<!-- Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC),        -->
+<!-- 2003 Contributors                                                         -->
 <!-- All rights reserved.                                                      -->
 <!-- This program and the accompanying materials are made available            -->
 <!-- under the terms of the Common Public License v1.0                         -->
@@ -10,6 +11,7 @@
 <!--                                                                           -->
 <!-- Contributors:                                                             -->
 <!--     Xerox/PARC     initial implementation                                 -->
+<!--     Adrian Colyer / George Harley eclipse plugin targets                  -->
 <!-- ========================================================================= -->
 
 <!DOCTYPE project [
@@ -17,7 +19,7 @@
 ]>
 <project name="build" default="all" basedir=".">
 
-    <target name="all"     depends="aspectj"/>
+    <target name="all"     depends="aspectj,eclipse.plugins"/>
     <target name="rebuild" depends="clean,all"/>
     <target name="clean"   depends="clean-directories"/>
 
@@ -353,5 +355,77 @@ To use testing client jar in tests,
          </antcall>
     </target>
 
+    <!-- ===================================================================== -->
+    <!-- eclipse plugins                                                       -->
+    <!-- ===================================================================== -->
+
+       <target name="eclipse.plugins" depends="org.aspectj.ajde.source,
+                                               org.aspectj.ajde.doc,
+                                               org.aspectj.ajde"
+           description="create the Eclipse distribution plugins"/>       
+
+       <target name="org.aspectj.ajde.source" depends="init"
+         description="build the AspectJ source distribution plugin">
+         <copy todir="${aj.plugin.org.aspectj.ajde.source.dir}">
+           <fileset dir="${aspectj.modules.dir}/eclipse.plugins/org.aspectj.ajde.source"/>
+         </copy>         
+         <replace file="${aj.plugin.org.aspectj.ajde.source.dir}/plugin.xml"
+                  token="build.version.eclipse.plugins"
+                  value="${build.version.eclipse.plugins}"/>
+         <copy file="${aspectj.modules.dir}/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip"
+               todir="${aj.plugin.org.aspectj.ajde.source.dir}/src"/> 
+         <zip destfile="${aj.plugin.org.aspectj.ajde.source.dir}/src/aspectjsrc.zip">
+           <fileset dir="${aspectj.modules.dir}/ajbrowser/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/ajde/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/asm/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/bridge/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/org.aspectj.ajdt.core/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/runtime/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/taskdefs/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/util/src" includes="**"/>
+           <fileset dir="${aspectj.modules.dir}/weaver/src" includes="**"/>
+         </zip>
+         <jar destfile="${aj.plugin.org.aspectj.ajde.source.dir}/../org.aspectj.ajde.source_${build.version.eclipse.plugins}.jar">
+           <fileset dir="${aj.plugin.org.aspectj.ajde.source.dir}" includes="**"/>         
+         </jar>
+       </target>
+
+       <target name="org.aspectj.ajde.doc" depends="init,docs-dist"
+         description="build the AspectJ documentation plugin for Eclipse">
+         <copy todir="${aj.plugin.org.aspectj.ajde.doc.dir}">
+           <fileset dir="${aspectj.modules.dir}/eclipse.plugins/org.aspectj.ajde.doc"/>
+         </copy>
+         <copy todir="${aj.plugin.org.aspectj.ajde.doc.dir}/doc">
+           <fileset dir="${aj.dist.dir}/docs/doc" includes="**"/>                
+         </copy>
+         <replace file="${aj.plugin.org.aspectj.ajde.doc.dir}/plugin.xml"
+                  token="build.version.eclipse.plugins"
+                  value="${build.version.eclipse.plugins}"/>
+         <jar destfile="${aj.plugin.org.aspectj.ajde.doc.dir}/../org.aspectj.ajde.doc_${build.version.eclipse.plugins}.jar">
+           <fileset dir="${aj.plugin.org.aspectj.ajde.doc.dir}" includes="**"/>            
+         </jar>
+       </target>
+
+       <target name="org.aspectj.ajde" depends="init,aspectj"
+         description="build the AspectJ library plugin for Eclipse">
+         <copy todir="${aj.plugin.org.aspectj.ajde.dir}">
+           <fileset dir="${aspectj.modules.dir}/eclipse.plugins/org.aspectj.ajde"/>
+         </copy>         
+         <replace file="${aj.plugin.org.aspectj.ajde.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.ajde.dir}"/> 
+         <copy file="${aj.dist.dir}/tools/lib/aspectjtools.jar"
+               todir="${aj.plugin.org.aspectj.ajde.dir}"/>
+         <jar destfile="${aj.plugin.org.aspectj.ajde.dir}/ajde.jar">
+               <zipfileset src="${aj.dist.dir}/tools/lib/aspectjtools.jar"
+                  includes="org/aspectj/**"/>
+         </jar>          
+         <jar destfile="${aj.plugin.org.aspectj.ajde.dir}/../org.aspectj.ajde_${build.version.eclipse.plugins}.jar">
+           <fileset dir="${aj.plugin.org.aspectj.ajde.dir}" includes="**"/>        
+         </jar>
+       </target>
+
 </project>