[pkg-java] r3761 - trunk/aspectj/debian
tgg at alioth.debian.org
tgg at alioth.debian.org
Sat Jun 30 15:38:52 UTC 2007
Author: tgg
Date: 2007-06-30 15:38:52 +0000 (Sat, 30 Jun 2007)
New Revision: 3761
Modified:
trunk/aspectj/debian/bootstrap.xml
trunk/aspectj/debian/changelog
Log:
fix generation of aspectjrt.jar. Rework changelog.
Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml 2007-06-29 16:52:36 UTC (rev 3760)
+++ trunk/aspectj/debian/bootstrap.xml 2007-06-30 15:38:52 UTC (rev 3761)
@@ -10,14 +10,18 @@
<property name="aspectj.bin.dir" location="${aspectj.base.dir}/classes"/>
<property name="aspectj.lib.dir" location="${aspectj.base.dir}/lib"/>
<property name="aspectjrt.jar" location="${aspectj.lib.dir}/aspectjrt.jar"/>
+ <property name="aspectjtools.jar" location="${aspectj.lib.dir}/aspectjtols.jar"/>
<target name="jar" depends="compile-build,compile-aspectj">
<jar destfile="${build.jar}">
<fileset dir="${build.bin.dir}"/>
<fileset dir="${build.src.dir}" includes="**/*.properties"/>
</jar>
- <jar destfile="${aspectjrt.jar}">
- <fileset dir="${aspectj.bin.dir}"/>
+
+ <jar destfile="${aspectjrt.jar}" basedir="${aspectj.bin.dir}">
+ <include name="org/aspectj/internal/**"/>
+ <include name="org/aspectj/lang/**"/>
+ <include name="org/aspectj/runtime/**"/>
</jar>
</target>
@@ -42,20 +46,29 @@
<src path="org.aspectj/modules/runtime/src"/>
<src path="org.aspectj/modules/aspectj5rt/java5-src"/>
<src path="org.aspectj/modules/aspectj5rt/src"/>
- <include name="org/**"/>
</javac>
+
+ <!-- <javac destdir="${aspectj.bin.dir}" debug="on"
+ classpath="/usr/share/java/ant.jar" source="1.5">
+ <src path="org.aspectj/modules/ajde/src"/>
+ <src path="org.aspectj/modules/asm/src"/>
+ <src path="org.aspectj/modules/util/src"/>
+ <src path="org.aspectj/modules/bridge/src"/>
+ </javac> -->
</target>
<target name="clean">
<delete dir="${build.bin.dir}" quiet="true"/>
<delete dir="${build.base.dir}" quiet="true"/>
<delete dir="${aspectj.bin.dir}" quiet="true"/>
- <delete dir="${aspectj.lib.dir}" quiet="true"/>
+ <delete dir="${aspectj.bin.dir}" quiet="true"/>
<delete file="${aspectjrt.jar}"/>
+
<ant antfile="debian/jar_from_src_zip.xml" target="clean">
<property name="module.dir" value="org.aspectj/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="org.aspectj/modules/lib/ext/jrockit"/>
<property name="module.name" value="jrockit"/>
@@ -68,6 +81,7 @@
<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="org.aspectj/modules/lib/ext/jrockit"/>
<property name="module.name" value="jrockit"/>
Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2007-06-29 16:52:36 UTC (rev 3760)
+++ trunk/aspectj/debian/changelog 2007-06-30 15:38:52 UTC (rev 3761)
@@ -2,8 +2,7 @@
* New maintainer. Closes: #352521.
* New upstream release. Closes: #286087.
- * AspectJ 5 builds cleanly with gcj/gij. The package can move to main, as
- it no longer requires contrib dependency. Closes: #397559.
+ * AspectJ 5 builds cleanly with gcj/gij. Closes: #397559.
* Bump debhelper level to 5.
* Convert debian/rules to cdbs.
* Install ajdoc.
More information about the pkg-java-commits
mailing list