[pkg-java] r3605 - trunk/aspectj/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-06-06 15:08:22 +0000 (Wed, 06 Jun 2007)
New Revision: 3605

Modified:
   trunk/aspectj/debian/bootstrap.xml
Log:
bootstrap aspectjrt.jar as well. Not sure if it's a good idea


Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml	2007-06-06 13:35:37 UTC (rev 3604)
+++ trunk/aspectj/debian/bootstrap.xml	2007-06-06 15:08:22 UTC (rev 3605)
@@ -6,26 +6,52 @@
   <property name="build.bin.dir" location="${build.base.dir}/classes"/>
   <property name="build.jar" location="${build.base.dir}/build.jar"/>
 
-  <target name="jar" depends="compile-build">
+  <property name="aspectj.base.dir" location="modules/lib/aspectj"/>
+  <property name="aspectj.bin.dir" location="${aspectj.base.dir}/classes"/>
+  <property name="aspectj.lib.dir" location="${aspectj.base.dir}/lib"/>
+  <property name="aspectjrt.jar" location="${aspectj.lib.dir}/aspectjrt.jar"/>
+
+  <target name="jar" depends="compile-build,compile-aspectj">
     <jar destfile="${build.jar}">
       <fileset dir="${build.bin.dir}"/>
       <fileset dir="${build.src.dir}" includes="**/*.properties"/>
     </jar>
+    <jar destfile="${aspectjrt.jar}">
+      <fileset dir="${aspectj.bin.dir}"/>
+    </jar>
   </target>
 
-  <target name="init">
+  <target name="init-build">
     <mkdir dir="${build.base.dir}"/>
     <mkdir dir="${build.bin.dir}"/>
   </target>
 
-  <target name="compile-build" depends="init">
+  <target name="compile-build" depends="init-build">
     <javac srcdir="${build.src.dir}" destdir="${build.bin.dir}" debug="on"
            includes="org/**" classpath="/usr/share/java/ant.jar"/>
   </target>
 
+  <target name="init-aspectj">
+    <mkdir dir="${aspectj.bin.dir}"/>
+    <mkdir dir="${aspectj.lib.dir}"/>
+  </target>
+
+  <target name="compile-aspectj" depends="init-aspectj">
+    <javac destdir="${aspectj.bin.dir}" debug="on"
+           classpath="/usr/share/java/ant.jar" source="1.5">
+      <src path="modules/runtime/src"/>
+      <src path="modules/aspectj5rt/java5-src"/>
+      <src path="modules/aspectj5rt/src"/>
+      <include name="org/**"/>
+    </javac>
+  </target>
+
   <target name="clean">
     <delete dir="${build.bin.dir}" quiet="true"/>
     <delete dir="${build.base.dir}" quiet="true"/>
+    <delete dir="${aspectj.bin.dir}" quiet="true"/>
+    <delete dir="${aspectj.lib.dir}" quiet="true"/>
+    <delete file="${aspectjrt.jar}"/>
     <ant antfile="debian/jar_from_src_zip.xml" target="clean">
       <property name="module.dir" value="modules/lib/bcel"/>
       <property name="module.name" value="bcel"/>