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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-27 14:30:47 +0000 (Sun, 27 May 2007)
New Revision: 3543

Modified:
   trunk/aspectj/debian/cvs-get.sh
   trunk/aspectj/debian/jar_from_src_zip.xml
   trunk/aspectj/debian/rules
Log:
make jar_from_src_zip.xml more generic; and plug it with bcel


Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2007-05-26 22:20:42 UTC (rev 3542)
+++ trunk/aspectj/debian/cvs-get.sh	2007-05-27 14:30:47 UTC (rev 3543)
@@ -28,7 +28,7 @@
 rm -Rf $TMPDIR/org.aspectj/modules/lib/commons
 rm -Rf $TMPDIR/org.aspectj/modules/lib/jdiff
 rm -Rf $TMPDIR/org.aspectj/modules/lib/bcel/bcel.jar
-rm  -f $TMPDIR/org.aspectj/modules/lib/ext/jrockit/managementapi-jrockit81.jar
+(cd $TMPDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar)
 
 echo "generating ../aspectj_$VERSION.orig.tar.gz"
 tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz org.aspectj

Modified: trunk/aspectj/debian/jar_from_src_zip.xml
===================================================================
--- trunk/aspectj/debian/jar_from_src_zip.xml	2007-05-26 22:20:42 UTC (rev 3542)
+++ trunk/aspectj/debian/jar_from_src_zip.xml	2007-05-27 14:30:47 UTC (rev 3543)
@@ -1,12 +1,11 @@
-<!-- Simple Ant buildfile to compile AspectJ modified version of   -->
-<!-- the Apache BCEL library.                                      -->
+<!-- Simple Ant buildfile to compile a src.zip into a jar          -->
 <!--                                                               -->
 <!-- Written by Thomas Girard <thomas.g.girard at free.fr> for Debian -->
-<project name="aj-bcel" default="jar" basedir=".">
-  <property name="src.dir" location="extracted"/>
-  <property name="bin.dir" location="classes"/>
-  <property name="src.jar" location="bcel-src.zip"/>
-  <property name="bin.jar" location="bcel.jar"/>
+<project name="jar-from-src-zip" default="jar" basedir="..">
+  <property name="src.dir" location="${module.dir}/extracted"/>
+  <property name="bin.dir" location="${module.dir}/classes"/>
+  <property name="src.jar" location="${module.dir}/${module.name}-src.zip"/>
+  <property name="bin.jar" location="${module.dir}/${module.name}.jar"/>
 
   <target name="jar" depends="compile">
     <jar jarfile="${bin.jar}" basedir="${bin.dir}"/>
@@ -14,7 +13,7 @@
 
   <target name="compile" depends="extract">
     <mkdir dir="${bin.dir}"/>
-    <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="on" classpath="/usr/share/java/regexp.jar"/>
+    <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="on" classpath="${module.deps}"/>
   </target>
 
   <target name="extract" depends="checkExtracted" unless="extract.notRequired">

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-05-26 22:20:42 UTC (rev 3542)
+++ trunk/aspectj/debian/rules	2007-05-27 14:30:47 UTC (rev 3543)
@@ -62,8 +62,9 @@
 
 # We need to compile the AspectJ modified bcel library
 $(AJ_BCEL_HOME)/bcel.jar: DEB_BUILDDIR=$(AJ_BCEL_HOME)
+$(AJ_BCEL_HOME)/bcel.jar: DEB_ANT_BUILDFILE=$(CURDIR)/debian/jar_from_src_zip.xml
 $(AJ_BCEL_HOME)/bcel.jar: $(AJ_BCEL_HOME)/bcel-src.zip
-	$(DEB_ANT_INVOKE) jar
+	$(DEB_ANT_INVOKE) -Dmodule.dir=$(AJ_BCEL_HOME) -Dmodule.name=bcel -Dmodule.deps=/usr/share/java/regexp.jar
 
 .PHONY: get-orig-source
 get-orig-source: