Author: tgg
Date: 2007-05-28 08:48:57 +0000 (Mon, 28 May 2007)
New Revision: 3550
Modified:
trunk/aspectj/debian/bootstrap.xml
trunk/aspectj/debian/cvs-get.sh
trunk/aspectj/debian/rules
Log:
fix build.jar lack of .properties. Enhance clean: target
Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml 2007-05-28 08:01:31 UTC (rev 3549)
+++ trunk/aspectj/debian/bootstrap.xml 2007-05-28 08:48:57 UTC (rev 3550)
@@ -7,7 +7,10 @@
<property name="build.jar" location="${build.base.dir}/build.jar"/>
<target name="jar" depends="compile-build">
- <jar jarfile="${build.jar}" basedir="${build.bin.dir}"/>
+ <jar destfile="${build.jar}">
+ <fileset dir="${build.bin.dir}"/>
+ <fileset dir="${build.src.dir}" includes="**/*.properties"/>
+ </jar>
</target>
<target name="init">
Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh 2007-05-28 08:01:31 UTC (rev 3549)
+++ trunk/aspectj/debian/cvs-get.sh 2007-05-28 08:48:57 UTC (rev 3550)
@@ -24,6 +24,7 @@
rm -Rf $TMPDIR/org.aspectj/modules/lib/junit
# We don't need those
rm -Rf $TMPDIR/org.aspectj/modules/lib/asm
+rm -Rf $TMPDIR/org.aspectj/modules/lib/build
rm -Rf $TMPDIR/org.aspectj/modules/lib/jython
rm -Rf $TMPDIR/org.aspectj/modules/lib/commons
rm -Rf $TMPDIR/org.aspectj/modules/lib/jdiff
Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2007-05-28 08:01:31 UTC (rev 3549)
+++ trunk/aspectj/debian/rules 2007-05-28 08:48:57 UTC (rev 3550)
@@ -58,6 +58,13 @@
$(DEB_ANT_INVOKE)
touch $@
+.PHONY: clean-bootstrap
+clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
+clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+clean-bootstrap:
+ $(DEB_ANT_INVOKE) clean
+ rm -f bootstrap-stamp
+
clean::
rm -Rf $(AJ_ANT_HOME)
rm -Rf $(AJ_JUNIT_HOME)
@@ -68,9 +75,12 @@
rm -Rf modules/lib/jdiff
rm -Rf modules/lib/bcel/bcel.jar
(cd modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt
managementapi-jrockit81.jar)
+ rm -f modules/lib/gnu-classpath-tools-gjdoc.jar
rm -f $(DEB_BUILDDIR)/local.properties
+ -$(MAKE) -f debian/rules clean-bootstrap
+
.PHONY: get-orig-source
get-orig-source:
sh debian/cvs-get.sh
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
