[pkg-java] r3535 - in trunk/aspectj/debian: . patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-23 22:30:47 +0000 (Wed, 23 May 2007)
New Revision: 3535

Added:
   trunk/aspectj/debian/patches/03_handcompile_modified_bcel.diff
Modified:
   trunk/aspectj/debian/control
   trunk/aspectj/debian/cvs-get.sh
   trunk/aspectj/debian/rules
Log:
drop jdiff, JRockit management api impl jar and build bcel ourselves


Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control	2007-05-23 22:20:33 UTC (rev 3534)
+++ trunk/aspectj/debian/control	2007-05-23 22:30:47 UTC (rev 3535)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Thomas Girard <thomas.g.girard at free.fr>
-Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant (>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, libcommons-logging-java, junit (>= 3.8.1)
+Build-Depends: debhelper (>> 5), gcj, java-gcj-compat-dev (>= 1.0.65-6), ant (>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, libcommons-logging-java, junit (>= 3.8.1), libregexp-java
 Standards-Version: 3.7.2
 
 Package: aspectj

Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh	2007-05-23 22:20:33 UTC (rev 3534)
+++ trunk/aspectj/debian/cvs-get.sh	2007-05-23 22:30:47 UTC (rev 3535)
@@ -26,6 +26,9 @@
 rm -Rf $TMPDIR/org.aspectj/modules/lib/asm
 rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
 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
 
 echo "generating ../aspectj_$VERSION.orig.tar.gz"
 tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz org.aspectj

Added: trunk/aspectj/debian/patches/03_handcompile_modified_bcel.diff
===================================================================
--- trunk/aspectj/debian/patches/03_handcompile_modified_bcel.diff	                        (rev 0)
+++ trunk/aspectj/debian/patches/03_handcompile_modified_bcel.diff	2007-05-23 22:30:47 UTC (rev 3535)
@@ -0,0 +1,38 @@
+--- /dev/null	2007-01-04 21:54:14.000000000 +0000
++++ aspectj/modules/lib/bcel/build.xml	2007-05-23 22:41:59.000000000 +0000
+@@ -0,0 +1,35 @@
++<!-- Simple Ant buildfile to compile AspectJ modified version of   -->
++<!-- the Apache BCEL library.                                      -->
++<!--                                                               -->
++<!-- 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"/>
++
++  <target name="jar" depends="compile">
++    <jar jarfile="${bin.jar}" basedir="${bin.dir}"/>
++  </target>
++
++  <target name="compile" depends="extract">
++    <mkdir dir="${bin.dir}"/>
++    <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="on" classpath="/usr/share/java/regexp.jar"/>
++  </target>
++
++  <target name="extract" depends="checkExtracted" unless="extract.notRequired">
++    <delete dir="${src.dir}" quiet="true"/>
++    <mkdir dir="${src.dir}"/>    
++    <unzip src="${src.jar}" dest="${src.dir}"/>
++  </target>
++
++  <target name="checkExtracted">
++    <uptodate property="extract.notRequired" srcfile="${src.jar}" targetfile="${src.dir}"/>
++  </target>
++
++  <target name="clean">
++    <delete dir="${src.dir}" quiet="true"/>
++    <delete dir="${bin.dir}" quiet="true"/>
++    <delete file="${bin.jar}" quiet="true"/>
++  </target>
++</project>

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-05-23 22:20:33 UTC (rev 3534)
+++ trunk/aspectj/debian/rules	2007-05-23 22:30:47 UTC (rev 3535)
@@ -8,7 +8,7 @@
 DEB_BUILDDIR := modules/build
 
 MKDIR := mkdir -p
-LN_S  := ln -sf
+LN_S := ln -sf
 
 AJ_ANT_HOME := modules/lib/ant
 AJ_ANT_JARS := ant.jar ant-junit.jar
@@ -20,7 +20,12 @@
 AJ_COMMONS_HOME := modules/lib/commons
 AJ_COMMONS_JAR := commons-logging.jar
 
-pre-build::
+AJ_BCEL_HOME := modules/lib/bcel
+
+# We need to compile the AspectJ modified bcel library
+$(AJ_BCEL_HOME)/bcel.jar: $(AJ_BCEL_HOME)/bcel-src.zip
+
+pre-build:: $(AJ_BCEL_HOME)/bcel.jar
 	# Setup symlinks: ant
 	mkdir -p $(AJ_ANT_HOME)/lib
 	for f in $(AJ_ANT_JARS) ; do \
@@ -52,6 +57,9 @@
 	rm -Rf modules/lib/jython
 	rm -Rf modules/lib/asm
 	rm -Rf modules/lib/commons
+	rm -Rf modules/lib/jdiff
+	rm -Rf modules/lib/bcel/bcel.jar
+	rm -f  modules/lib/ext/jrockit/managementapi-jrockit81.jar
 
 	rm -f $(DEB_BUILDDIR)/local.properties