Author: tgg
Date: 2007-05-27 20:34:48 +0000 (Sun, 27 May 2007)
New Revision: 3545
Modified:
trunk/aspectj/debian/jar_from_src_zip.xml
trunk/aspectj/debian/rules
Log:
make it possible to rebuild jrockit.jar from source
Modified: trunk/aspectj/debian/jar_from_src_zip.xml
===================================================================
--- trunk/aspectj/debian/jar_from_src_zip.xml 2007-05-27 19:47:45 UTC (rev
3544)
+++ trunk/aspectj/debian/jar_from_src_zip.xml 2007-05-27 20:34:48 UTC (rev
3545)
@@ -13,7 +13,7 @@
<target name="compile" depends="extract">
<mkdir dir="${bin.dir}"/>
- <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="on"
classpath="${module.deps}"/>
+ <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="on"
classpath="${module.deps}" sourcepath="${module.srcdeps}"/>
</target>
<target name="extract" depends="checkExtracted" unless="extract.notRequired">
Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2007-05-27 19:47:45 UTC (rev 3544)
+++ trunk/aspectj/debian/rules 2007-05-27 20:34:48 UTC (rev 3545)
@@ -21,8 +21,9 @@
AJ_COMMONS_JAR := commons-logging.jar
AJ_BCEL_HOME := modules/lib/bcel
+AJ_JROCKIT_HOME := modules/lib/ext/jrockit
-pre-build:: $(AJ_BCEL_HOME)/bcel.jar
+pre-build:: $(AJ_BCEL_HOME)/bcel.jar $(AJ_JROCKIT_HOME)/jrockit.jar
# Setup symlinks: ant
mkdir -p $(AJ_ANT_HOME)/lib
for f in $(AJ_ANT_JARS) ; do \
@@ -56,7 +57,7 @@
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
+ (cd modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt
managementapi-jrockit81.jar)
rm -f $(DEB_BUILDDIR)/local.properties
@@ -66,6 +67,12 @@
$(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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
