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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-28 08:01:31 +0000 (Mon, 28 May 2007)
New Revision: 3549

Modified:
   trunk/aspectj/debian/bootstrap.xml
   trunk/aspectj/debian/rules
Log:
control the whole bootstrapping process from within bootstrap.xml


Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml	2007-05-27 22:42:28 UTC (rev 3548)
+++ trunk/aspectj/debian/bootstrap.xml	2007-05-28 08:01:31 UTC (rev 3549)
@@ -1,6 +1,6 @@
 <!-- Bootstraps AspectJ build parts                                -->
 <!-- Written by Thomas Girard <thomas.g.girard at free.fr> for Debian -->
-<project name="bootstrap" default="jar" basedir="..">
+<project name="bootstrap" default="all" basedir="..">
   <property name="build.src.dir" location="modules/build/src"/>
   <property name="build.base.dir" location="modules/lib/build"/>
   <property name="build.bin.dir" location="${build.base.dir}/classes"/>
@@ -23,5 +23,26 @@
   <target name="clean">
     <delete dir="${build.bin.dir}" quiet="true"/>
     <delete dir="${build.base.dir}" quiet="true"/>
+    <ant antfile="debian/jar_from_src_zip.xml" target="clean">
+      <property name="module.dir" value="modules/lib/bcel"/>
+      <property name="module.name" value="bcel"/>
+    </ant>
+    <ant antfile="debian/jar_from_src_zip.xml" target="clean">
+      <property name="module.dir" value="modules/lib/ext/jrockit"/>
+      <property name="module.name" value="jrockit"/>
+    </ant>
   </target>
+
+  <target name="all" depends="jar">
+    <ant antfile="debian/jar_from_src_zip.xml">
+      <property name="module.dir" value="modules/lib/bcel"/>
+      <property name="module.name" value="bcel"/>
+      <property name="module.deps" value="/usr/share/java/regexp.jar"/>
+    </ant>
+    <ant antfile="debian/jar_from_src_zip.xml">
+      <property name="module.dir" value="modules/lib/ext/jrockit"/>
+      <property name="module.name" value="jrockit"/>
+      <property name="module.srcdeps" value="modules/loadtime/testsrc"/>
+    </ant>
+  </target>
 </project>

Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-05-27 22:42:28 UTC (rev 3548)
+++ trunk/aspectj/debian/rules	2007-05-28 08:01:31 UTC (rev 3549)
@@ -23,7 +23,7 @@
 AJ_BCEL_HOME := modules/lib/bcel
 AJ_JROCKIT_HOME := modules/lib/ext/jrockit
 
-pre-build:: $(AJ_BCEL_HOME)/bcel.jar $(AJ_JROCKIT_HOME)/jrockit.jar
+pre-build:: bootstrap-stamp
 	# Setup symlinks: ant
 	mkdir -p $(AJ_ANT_HOME)/lib
 	for f in $(AJ_ANT_JARS) ; do \
@@ -49,11 +49,21 @@
 	# Also symlink gjdoc.jar
 	$(LN_S) /usr/share/java/gnu-classpath-tools-gjdoc.jar modules/lib
 
+.PHONY: bootstrap
+bootstrap: bootstrap-stamp
+
+bootstrap-stamp: DEB_BUILDDIR=$(CURDIR)
+bootstrap-stamp: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+bootstrap-stamp:
+	$(DEB_ANT_INVOKE)
+	touch $@
+
 clean::
 	rm -Rf $(AJ_ANT_HOME)
 	rm -Rf $(AJ_JUNIT_HOME)
 	rm -Rf modules/lib/jython
 	rm -Rf modules/lib/asm
+	rm -Rf modules/lib/build
 	rm -Rf modules/lib/commons
 	rm -Rf modules/lib/jdiff
 	rm -Rf modules/lib/bcel/bcel.jar
@@ -61,18 +71,6 @@
 
 	rm -f $(DEB_BUILDDIR)/local.properties
 
-# 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) -Dmodule.dir=$(AJ_BCEL_HOME) -Dmodule.name=bcel -Dmodule.deps=/usr/share/java/regexp.jar
-
-# JRockit JMAPI loadttime weaver
-$(AJ_JROCKIT_HOME)/jrockit.jar: DEB_BUILDDIR=$(AJ_JROCKIT_HOME)
-$(AJ_JROCKIT_HOME)/jrockit.jar: DEB_ANT_BUILDFILE=$(CURDIR)/debian/jar_from_src_zip.xml
-$(AJ_JROCKIT_HOME)/jrockit.jar: $(AJ_JROCKIT_HOME)/jrockit-src.zip
-	$(DEB_ANT_INVOKE) -Dmodule.dir=$(AJ_JROCKIT_HOME) -Dmodule.name=jrockit -Dmodule.srcdeps=$(CURDIR)/modules/loadtime/testsrc
-
 .PHONY: get-orig-source
 get-orig-source:
 	sh debian/cvs-get.sh