[pkg-java] r9396 - in trunk/aspectj/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Sun Jul 26 22:10:09 UTC 2009
Author: drazzib-guest
Date: 2009-07-26 22:10:08 +0000 (Sun, 26 Jul 2009)
New Revision: 9396
Added:
trunk/aspectj/debian/patches/05_build_classpath.diff
trunk/aspectj/debian/patches/series
Removed:
trunk/aspectj/debian/aspectj.dirs
Modified:
trunk/aspectj/debian/
trunk/aspectj/debian/README.source
trunk/aspectj/debian/aspectj-doc.docs
trunk/aspectj/debian/aspectj.install
trunk/aspectj/debian/bootstrap.xml
trunk/aspectj/debian/changelog
trunk/aspectj/debian/control
trunk/aspectj/debian/cvs-get.sh
trunk/aspectj/debian/jar_from_src_zip.xml
trunk/aspectj/debian/local.properties
trunk/aspectj/debian/patches/01_ajc_xml_typo.diff
trunk/aspectj/debian/patches/02_use_gjdoc.diff
trunk/aspectj/debian/patches/03_use_system_docbook.diff
trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
trunk/aspectj/debian/rules
trunk/aspectj/debian/watch
Log:
[aspectj]
[ Damien Raude-Morvan ]
* Add myself to Uploaders
* Updated Standards-Version to 3.8.2:
- Describe quilt patch system in README.source
- Move "aspectj" package to "java" section
* Switch to quilt to manage patches:
- Use patchsys-quilt.mk in debian/rules
- Build-Depends on quilt
- Refresh all patches
* Extends bootstrap.xml script:
- Rebuild jdtcore-for-aspectj.jar from jdtcore-for-aspectj-src.zip
Build-Depends on eclipse-platform
- Bootstrap using aspectj itself for modules/lib/aspectj/lib/*.jar
Build-Depends on aspectj
- Rebuild and overwrite build.jar
* New 05_build_classpath patch to build AJDT
* Add Build-Depends on libasm3-java, eclipse-platform, gjdoc and lynx-cur
Property changes on: trunk/aspectj/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/aspectj/debian/README.source
===================================================================
--- trunk/aspectj/debian/README.source 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/README.source 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,3 +1,13 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+
Building AspectJ from source
============================
@@ -9,3 +19,5 @@
o org.aspectj/modules/build/products/tools/dist/lib/aspectjweaver.jar
o org.aspectj/modules/build/products/tools/dist/lib/aspectjrt.jar
o org.aspectj/modules/build/products/tools/dist/lib/aspectjlib.jar
+ * bootstrap jars (rebuild and overwritten by "bootstrap" target):
+ o org.aspectj/modules/lib/build/build.jar
Modified: trunk/aspectj/debian/aspectj-doc.docs
===================================================================
--- trunk/aspectj/debian/aspectj-doc.docs 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/aspectj-doc.docs 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1 +1,9 @@
-org.aspectj/modules/aj-build/dist/docs/doc/*
+org.aspectj/modules/aj-build/dist/docs/doc/README*
+org.aspectj/modules/aj-build/dist/docs/doc/devguide
+org.aspectj/modules/aj-build/dist/docs/doc/progguide
+org.aspectj/modules/aj-build/dist/docs/doc/pdguide
+org.aspectj/modules/aj-build/dist/docs/doc/examples
+org.aspectj/modules/aj-build/dist/docs/doc/adk15notebook
+org.aspectj/modules/aj-build/dist/docs/doc/aspectj5rt-api
+org.aspectj/modules/aj-build/dist/docs/doc/runtime-api
+org.aspectj/modules/aj-build/dist/docs/doc/weaver-api
Deleted: trunk/aspectj/debian/aspectj.dirs
===================================================================
--- trunk/aspectj/debian/aspectj.dirs 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/aspectj.dirs 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/java
Modified: trunk/aspectj/debian/aspectj.install
===================================================================
--- trunk/aspectj/debian/aspectj.install 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/aspectj.install 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1 +1 @@
-org.aspectj/modules/aj-build/dist/tools/lib/*.jar usr/share/java
+org.aspectj/modules/aj-build/dist/tools/lib/aspectj*.jar usr/share/java
Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/bootstrap.xml 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,6 +1,8 @@
<!-- Bootstraps AspectJ build parts -->
-<!-- Written by Thomas Girard <thomas.g.girard at free.fr> for Debian -->
+<!-- Written by Thomas Girard <thomas.g.girard at free.fr> -->
+<!-- and Damien Raude-Morvan <drazzib at drazzib.com> for Debian -->
<project name="bootstrap" default="all" basedir="..">
+
<target name="clean">
<ant antfile="debian/jar_from_src_zip.xml" target="clean">
<property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
@@ -11,6 +13,11 @@
<property name="module.dir" value="org.aspectj/modules/lib/ext/jrockit"/>
<property name="module.name" value="jrockit"/>
</ant>
+
+ <ant antfile="debian/jar_from_src_zip.xml" target="clean">
+ <property name="module.dir" value="org.aspectj/modules/org.eclipse.jdt.core"/>
+ <property name="module.name" value="jdtcore-for-aspectj"/>
+ </ant>
</target>
<target name="all">
@@ -19,6 +26,8 @@
<property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
<property name="module.name" value="bcel"/>
<property name="module.deps" value="/usr/share/java/regexp.jar"/>
+ <target name="compile"/>
+ <target name="jar"/>
</ant>
<!-- ... and jrockit -->
@@ -26,6 +35,46 @@
<property name="module.dir" value="org.aspectj/modules/lib/ext/jrockit"/>
<property name="module.name" value="jrockit"/>
<property name="module.srcdeps" value="org.aspectj/modules/loadtime/testsrc"/>
+ <target name="compile"/>
+ <target name="jar"/>
</ant>
+
+ <!-- rebuild jdtcore with aspect -->
+ <path id="classpath.jdtcore">
+ <fileset dir="/usr/lib/eclipse/plugins/">
+ <include name="org.eclipse.osgi_*.jar"/>
+ <include name="org.eclipse.text_*.jar"/>
+ <include name="org.eclipse.update.configurator_*.jar"/>
+ <include name="org.eclipse.core.runtime_*.jar"/>
+ <include name="org.eclipse.core.jobs_*.jar"/>
+ <include name="org.eclipse.core.contenttype_*.jar"/>
+ <include name="org.eclipse.core.filesystem_*.jar"/>
+ <include name="org.eclipse.core.resources_*.jar"/>
+ <include name="org.eclipse.equinox.common_*.jar"/>
+ <include name="org.eclipse.equinox.app_*.jar"/>
+ <include name="org.eclipse.equinox.preferences_*.jar"/>
+ <include name="org.eclipse.equinox.registry_*.jar"/>
+ </fileset>
+ <fileset dir="/usr/share/java/">
+ <include name="aspectjrt.jar"/>
+ <include name="ant.jar"/>
+ </fileset>
+ </path>
+
+ <ant antfile="debian/jar_from_src_zip.xml">
+ <property name="module.dir" value="org.aspectj/modules/org.eclipse.jdt.core"/>
+ <property name="module.name" value="jdtcore-for-aspectj"/>
+ <property name="module.deps" value="${toString:classpath.jdtcore}"/>
+ <target name="compile-aj"/>
+ <target name="jar-aj"/>
+ </ant>
+
+ <!-- rebuild and overwrite build.jar -->
+ <ant antfile="build.xml"
+ dir="org.aspectj/modules/build"
+ target="build"/>
+ <copy file="org.aspectj/modules/aj-build/jars/build.jar"
+ tofile="org.aspectj/modules/lib/build/build.jar"/>
+
</target>
</project>
Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/changelog 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,11 +1,29 @@
-aspectj (1.6.1-1) UNRELEASED; urgency=low
+aspectj (1.6.5-1) UNRELEASED; urgency=low
- * New upstream release.
+ [ Thomas Girard ]
* Move to main. Closes: #480132.
- * Build-depend on default-jdk-builddep.
+ * Build-depend on openjdk-6.
- -- Thomas Girard <thomas.g.girard at free.fr> Sun, 11 May 2008 11:46:41 +0000
+ [ Damien Raude-Morvan ]
+ * Add myself to Uploaders
+ * Updated Standards-Version to 3.8.2:
+ - Describe quilt patch system in README.source
+ - Move "aspectj" package to "java" section
+ * Switch to quilt to manage patches:
+ - Use patchsys-quilt.mk in debian/rules
+ - Build-Depends on quilt
+ - Refresh all patches
+ * Extends bootstrap.xml script:
+ - Rebuild jdtcore-for-aspectj.jar from jdtcore-for-aspectj-src.zip
+ Build-Depends on eclipse-platform
+ - Bootstrap using aspectj itself for modules/lib/aspectj/lib/*.jar
+ Build-Depends on aspectj
+ - Rebuild and overwrite build.jar
+ * New 05_build_classpath patch to build AJDT
+ * Add Build-Depends on libasm3-java, eclipse-platform, gjdoc and lynx-cur
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Sun, 26 Jul 2009 23:56:53 +0200
+
aspectj (1.5.4-1) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/control 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,17 +1,19 @@
Source: aspectj
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Thomas Girard <thomas.g.girard at free.fr>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>> 5), default-jdk-builddep, ant (>= 1.6.3), ant-optional (>= 1.6.3), libxalan2-java, cdbs, libcommons-logging-java, junit (>= 3.8.1), libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man
-Standards-Version: 3.7.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj
+Uploaders: Thomas Girard <thomas.g.girard at free.fr>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: debhelper (>> 5), openjdk-6-jdk, ant, ant-optional, cdbs, quilt
+Build-Depends-Indep: libxalan2-java, libcommons-logging-java, libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man,
+ junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc, lynx-cur
+Standards-Version: 3.8.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj/
Homepage: http://www.eclipse.org/aspectj
Package: aspectj
Architecture: all
-Depends: java2-runtime | java1-runtime | java-gcj-compat
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
Description: A seamless aspect-oriented extension for Java
AspectJ enables the clean modularization of crosscutting concerns
such as: error checking and handling, synchronization, context-sensitive
@@ -21,7 +23,8 @@
Package: aspectj-doc
Section: doc
Architecture: all
-Description: documentation for aspectj
+Depends: ${misc:Depends}
+Description: aspect-oriented extension for Java - documentation
AspectJ enables the clean modularization of crosscutting concerns
such as: error checking and handling, synchronization, context-sensitive
behavior, performance optimizations, monitoring and logging, debugging
Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/cvs-get.sh 2009-07-26 22:10:08 UTC (rev 9396)
@@ -15,7 +15,7 @@
VERSION=`head -1 debian/changelog | cut -d ' ' -f 2 | sed -e 's#(\([^-]\+\)-.*)#\1#'`
TAG="V`echo $VERSION | tr . _`"
-ORIGDIR="$TMPDIR/aspectj_$VERSION.orig"
+ORIGDIR="$TMPDIR/aspectj-$VERSION"
CVSROOT=":pserver:anonymous at dev.eclipse.org:/cvsroot/tools"
@@ -27,22 +27,30 @@
echo "keeping all files"
else
echo "removing unneeded files"
- find $ORIGDIR/org.aspectj -name .cvsignore | xargs -r rm
+ find $ORIGDIR/org.aspectj -name .cvsignore -delete
+ find $ORIGDIR/org.aspectj -type f -name "*.doc" -delete
+ find $ORIGDIR/org.aspectj -type f -name "*.pdf" -delete
# We'll use Debian version of these
rm -Rf $ORIGDIR/org.aspectj/modules/lib/ant
rm -Rf $ORIGDIR/org.aspectj/modules/lib/junit
rm -Rf $ORIGDIR/org.aspectj/modules/lib/commons
+ rm -Rf $ORIGDIR/org.aspectj/modules/lib/asm
# Keep sources only, rebuild them at package build time
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/bcel/bcel*.jar
+ rm -f $ORIGDIR/org.aspectj/modules/lib/bcel/bcel*.jar
+ rm -f $ORIGDIR/org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
+ # this jar is rebuild after initial bootstrap
+ #rm -f $ORIGDIR/org.aspectj/modules/lib/build/build.jar
+ # Bootstrap using symlink to existing aspectj
+ rm -f $ORIGDIR/org.aspectj/modules/lib/aspectj/lib/aspectj*.jar
+
# The LICENSE.TXT here refers to managementapi-jrockit81.jar which is removed as well
# See http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/modules/lib/ext/jrockit/LICENSE.TXT?root=Tools_Project&view=co
(cd $ORIGDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar)
# These ones are not needed
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/asm
rm -Rf $ORIGDIR/org.aspectj/modules/lib/docbook
rm -Rf $ORIGDIR/org.aspectj/modules/lib/jdiff
rm -Rf $ORIGDIR/org.aspectj/modules/lib/jython
@@ -55,4 +63,4 @@
fi
echo "generating ../aspectj_$VERSION.orig.tar.gz"
-tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz aspectj_$VERSION.orig
+tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz aspectj-$VERSION
Modified: trunk/aspectj/debian/jar_from_src_zip.xml
===================================================================
--- trunk/aspectj/debian/jar_from_src_zip.xml 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/jar_from_src_zip.xml 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,21 +1,45 @@
<!-- Simple Ant buildfile to compile a src.zip into a jar -->
-<!-- -->
-<!-- Written by Thomas Girard <thomas.g.girard at free.fr> for Debian -->
+<!-- Written by Thomas Girard <thomas.g.girard at free.fr> -->
+<!-- and Damien Raude-Morvan <drazzib at drazzib.com> for Debian -->
<project name="jar-from-src-zip" default="jar" basedir="..">
<property name="src.dir" location="${module.dir}/extracted"/>
<property name="bin.dir" location="${module.dir}/classes"/>
<property name="src.jar" location="${module.dir}/${module.name}-src.zip"/>
<property name="bin.jar" location="${module.dir}/${module.name}.jar"/>
- <target name="jar" depends="compile">
+ <taskdef
+ resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
+ <classpath>
+ <pathelement location="/usr/share/java/aspectjtools.jar"/>
+ </classpath>
+ </taskdef>
+
+ <target name="jar">
<jar jarfile="${bin.jar}" basedir="${bin.dir}"/>
</target>
+ <target name="jar-aj">
+ <jar jarfile="${bin.jar}">
+ <fileset dir="${bin.dir}"/>
+ <fileset dir="${src.dir}">
+ <include name="**/*.properties"/>
+ <include name="**/*.rsc"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="compile" depends="extract">
<mkdir dir="${bin.dir}"/>
<javac srcdir="${src.dir}" destdir="${bin.dir}" debug="on" classpath="${module.deps}" sourcepath="${module.srcdeps}"/>
</target>
+ <target name="compile-aj" depends="extract">
+ <mkdir dir="${bin.dir}"/>
+ <iajc sourceroots="${src.dir}"
+ destDir="${bin.dir}"
+ classpath="${module.deps}"/>
+ </target>
+
<target name="extract" depends="checkExtracted" unless="extract.notRequired">
<delete dir="${src.dir}" quiet="true"/>
<mkdir dir="${src.dir}"/>
Modified: trunk/aspectj/debian/local.properties
===================================================================
--- trunk/aspectj/debian/local.properties 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/local.properties 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,8 +1,9 @@
-build.version=1.6.1
+build.version=1.6.5
build.version.base=1.6
-build.version.long=1.6.1
-build.version.short=1.6.1
-java11.home=/usr/lib/jvm/default-java
-java13.home=/usr/lib/jvm/default-java
-java14.home=/usr/lib/jvm/default-java
-java15.home=/usr/lib/jvm/default-java
+build.version.long=1.6.5
+build.version.short=1.6.5
+
+java11.home=/usr/lib/jvm/java-6-openjdk
+java13.home=/usr/lib/jvm/java-6-openjdk
+java14.home=/usr/lib/jvm/java-6-openjdk
+java15.home=/usr/lib/jvm/java-6-openjdk
Modified: trunk/aspectj/debian/patches/01_ajc_xml_typo.diff
===================================================================
--- trunk/aspectj/debian/patches/01_ajc_xml_typo.diff 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/patches/01_ajc_xml_typo.diff 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,5 +1,5 @@
---- aspectj.orig/org.aspectj/modules/docs/devGuideDB/ajc.xml
-+++ aspectj/org.aspectj/modules/docs/devGuideDB/ajc.xml
+--- a/org.aspectj/modules/docs/devGuideDB/ajc.xml
++++ b/org.aspectj/modules/docs/devGuideDB/ajc.xml
@@ -45,8 +45,8 @@
(For a discussion of what affected types might be required,
see <ulink url="../progguide/implementation.html">The AspectJ
Modified: trunk/aspectj/debian/patches/02_use_gjdoc.diff
===================================================================
--- trunk/aspectj/debian/patches/02_use_gjdoc.diff 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/patches/02_use_gjdoc.diff 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,5 +1,5 @@
---- aspectj.orig/org.aspectj/modules/ajdoc/.classpath
-+++ aspectj/org.aspectj/modules/ajdoc/.classpath
+--- a/org.aspectj/modules/ajdoc/.classpath
++++ b/org.aspectj/modules/ajdoc/.classpath
@@ -7,6 +7,7 @@
<classpathentry kind="src" path="/util"/>
<classpathentry kind="src" path="testsrc"/>
@@ -8,8 +8,8 @@
<classpathentry kind="var" path="JAVA_HOME/lib/tools.jar"/>
<classpathentry kind="var" path="JRE14_LIB"/>
<classpathentry kind="output" path="bin"/>
---- aspectj.orig/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
-+++ aspectj/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
+--- a/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
++++ b/org.aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
@@ -21,10 +21,21 @@
* @author Mik Kersten
*/
Modified: trunk/aspectj/debian/patches/03_use_system_docbook.diff
===================================================================
--- trunk/aspectj/debian/patches/03_use_system_docbook.diff 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/patches/03_use_system_docbook.diff 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,5 +1,5 @@
---- aspectj.orig/org.aspectj/modules/docs/build.xml
-+++ aspectj/org.aspectj/modules/docs/build.xml
+--- a/org.aspectj/modules/docs/build.xml
++++ b/org.aspectj/modules/docs/build.xml
@@ -64,10 +64,10 @@
<!-- callers of xml-html use these by default -->
Modified: trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff
===================================================================
--- trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/patches/04_use_xsltproc_for_doc.diff 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,5 +1,5 @@
---- aspectj.orig/org.aspectj/modules/docs/build.xml
-+++ aspectj/org.aspectj/modules/docs/build.xml
+--- a/org.aspectj/modules/docs/build.xml
++++ b/org.aspectj/modules/docs/build.xml
@@ -69,10 +69,6 @@
<property name="nochunk.xsl.source"
location="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"
@@ -11,7 +11,7 @@
<!-- default value for xml-html copying (copy all graphics) -->
<property name="xml-html-copy" value="*.gif,*.png" />
<property name="xml-html-stylesheet" value="aspectj-docs.css" />
-@@ -273,7 +269,7 @@
+@@ -274,7 +270,7 @@
value="${nochunk.xsl.source}"
/>
<param name="xml-target-dir" value="${docs.dist.dir}" />
@@ -20,7 +20,7 @@
value="${docs.dist.dir}/doc/faq.html"
/>
<param name="xml-html-stylesheet" value="aspectj-faq.css" />
-@@ -359,6 +355,9 @@
+@@ -360,6 +356,9 @@
<param name="xml-target-dir"
value="${docs.dist.dir}/doc/${guide.name}"
/>
@@ -30,7 +30,7 @@
</antcall>
<!-- single -->
<antcall target="xml-html">
-@@ -372,7 +371,7 @@
+@@ -373,7 +372,7 @@
<param name="xml-target-dir"
value="${docs.dist.dir}/doc/${guide.name}"
/>
@@ -39,7 +39,7 @@
value="${docs.dist.dir}/doc/${guide.name}/printable.html"
/>
</antcall>
-@@ -483,13 +482,13 @@
+@@ -484,13 +483,13 @@
</target>
<target name="xml-html"
@@ -55,7 +55,7 @@
xml-html-copy # copy files to target (defaults to *.gif,*.png)
xml-html-stylesheet # style sheet to use (defaults to ${xml-html-stylesheet})"
>
-@@ -500,20 +499,21 @@
+@@ -501,20 +500,21 @@
includes="${xml-html-copy}"
/>
</copy>
Added: trunk/aspectj/debian/patches/05_build_classpath.diff
===================================================================
--- trunk/aspectj/debian/patches/05_build_classpath.diff (rev 0)
+++ trunk/aspectj/debian/patches/05_build_classpath.diff 2009-07-26 22:10:08 UTC (rev 9396)
@@ -0,0 +1,14 @@
+--- a/org.aspectj/modules/org.aspectj.ajdt.core/.classpath
++++ b/org.aspectj/modules/org.aspectj.ajdt.core/.classpath
+@@ -17,5 +17,11 @@
+ <classpathentry kind="lib" path="/lib/bcel/bcel-verifier.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
++ <classpathentry kind="lib" path="/lib/eclipse/org.eclipse.equinox.common.jar"/>
++ <classpathentry kind="lib" path="/lib/eclipse/org.eclipse.equinox.registry.jar"/>
++ <classpathentry kind="lib" path="/lib/eclipse/org.eclipse.core.resources.jar"/>
++ <classpathentry kind="lib" path="/lib/eclipse/org.eclipse.core.runtime.jar"/>
++ <classpathentry kind="lib" path="/lib/eclipse/org.eclipse.core.jobs.jar"/>
++ <classpathentry kind="lib" path="/lib/eclipse/org.eclipse.osgi.jar"/>
+ <classpathentry kind="output" path="bin"/>
+ </classpath>
Added: trunk/aspectj/debian/patches/series
===================================================================
--- trunk/aspectj/debian/patches/series (rev 0)
+++ trunk/aspectj/debian/patches/series 2009-07-26 22:10:08 UTC (rev 9396)
@@ -0,0 +1,5 @@
+01_ajc_xml_typo.diff
+02_use_gjdoc.diff
+03_use_system_docbook.diff
+04_use_xsltproc_for_doc.diff
+05_build_classpath.diff
Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/rules 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,19 +1,19 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
MODULES := org.aspectj/modules
DEB_BUILDDIR = $(MODULES)/build
+DEB_ANT_BUILD_TARGET = aspectj
DEB_ANT_CHECK_TARGET = test
DEB_JARS = xalan2 ant-junit
DEB_COMPRESS_EXCLUDE = .pdf .java .xml
MKDIR := mkdir -p
LN_S := ln -sf
-INSTALL := install -m 755
AJ_SCRIPTS := debian/ajc debian/ajbrowser debian/ajdoc debian/aj debian/aj5
AJ_MANPAGES := debian/ajc.1 debian/ajdoc.1 debian/aj.1 debian/ajbrowser.1
@@ -28,12 +28,34 @@
AJ_COMMONS_HOME := $(MODULES)/lib/commons
AJ_COMMONS_JAR := commons-logging.jar
+AJ_ECLIPSE_HOME := $(MODULES)/lib/eclipse
AJ_BCEL_HOME := $(MODULES)/lib/bcel
+AJ_ASM_HOME := $(MODULES)/lib/asm
AJ_JROCKIT_HOME := $(MODULES)/lib/ext/jrockit
+AJ_BOOT_HOME := $(MODULES)/lib/aspectj
+AJ_BOOT_JARS := aspectjlib.jar aspectjrt.jar aspectjtools.jar
+
pre-build:: debian/stamp-bootstrap
+
+debian/aj.1: debian/aj.sgml
+ docbook-to-man $< > $@
+
+debian/ajbrowser.1: debian/ajbrowser.sgml
+ docbook-to-man $< > $@
+
+# reuse the DocBook xml documents here to generate manpages.
+debian/%.1: org.aspectj/modules/docs/devGuideDB/%.xml
+ sh debian/manpage_from.sh $< > $@
+
+.PHONY: bootstrap
+bootstrap: debian/stamp-bootstrap
+
+debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
+debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
+debian/stamp-bootstrap:
# Setup symlinks: ant
- mkdir -p $(AJ_ANT_HOME)/lib
+ $(MKDIR) $(AJ_ANT_HOME)/lib
for f in $(AJ_ANT_JARS) ; do \
$(LN_S) /usr/share/ant/lib/$$f $(AJ_ANT_HOME)/lib ; \
done
@@ -42,77 +64,72 @@
done
# JUnit
- mkdir -p $(AJ_JUNIT_HOME)
+ $(MKDIR) $(AJ_JUNIT_HOME)
for f in $(AJ_JUNIT_JARS) ; do \
$(LN_S) /usr/share/java/$$f $(AJ_JUNIT_HOME) ; \
done
# commons-logging
- mkdir -p $(AJ_COMMONS_HOME)
+ $(MKDIR) $(AJ_COMMONS_HOME)
$(LN_S) /usr/share/java/$(AJ_COMMONS_JAR) $(AJ_COMMONS_HOME)/commons.jar
-
+
# Setup our local.properties
- cp debian/local.properties $(DEB_BUILDDIR)
+ cp debian/local.properties $(MODULES)/build
# Also symlink gjdoc.jar
$(LN_S) /usr/share/java/gnu-classpath-tools-gjdoc.jar $(MODULES)/lib
+
+ # bootstrap using aspectj itself
+ $(MKDIR) $(AJ_BOOT_HOME)
+ for f in $(AJ_BOOT_JARS) ; do \
+ $(LN_S) /usr/share/java/$$f $(AJ_BOOT_HOME)/lib ; \
+ done
-debian/aj.1: debian/aj.sgml
- docbook-to-man $< > $@
-
-debian/ajbrowser.1: debian/ajbrowser.sgml
- docbook-to-man $< > $@
-
-# reuse the DocBook xml documents here to generate manpages.
-debian/%.1: org.aspectj/modules/docs/devGuideDB/%.xml
- sh debian/manpage_from.sh $< > $@
-
-.PHONY: bootstrap
-bootstrap: debian/stamp-bootstrap
-
-debian/stamp-bootstrap: DEB_BUILDDIR=$(CURDIR)
-debian/stamp-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
-debian/stamp-bootstrap:
+ # asm3
+ $(MKDIR) $(AJ_ASM_HOME)
+ $(LN_S) /usr/share/java/asm3.jar $(AJ_ASM_HOME)/asm-3.1.jar
+
+ # eclipse (JDT)
+ $(MKDIR) $(AJ_ECLIPSE_HOME)
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.equinox.common_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.equinox.common.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.equinox.registry_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.equinox.registry.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.resources.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.runtime.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.jobs.jar
+ $(LN_S) /usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.osgi.jar
+
$(DEB_ANT_INVOKE)
touch $@
.PHONY: clean-bootstrap
clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
-clean-bootstrap:
+clean-bootstrap:
$(DEB_ANT_INVOKE) clean
rm -f debian/stamp-bootstrap
install/aspectj:: $(AJ_MANPAGES)
- $(INSTALL) -t debian/aspectj/usr/bin $(AJ_SCRIPTS)
+ for f in $(AJ_SCRIPTS) ; do \
+ dh_install $$f /usr/bin ; \
+ done
+install/aspectj-doc::
+ mv org.aspectj/modules/docs/dist/doc/changes.html org.aspectj/modules/docs/dist/doc/changelog.html
+ lynx -dump -nolist org.aspectj/modules/docs/dist/doc/changelog.html > org.aspectj/modules/docs/dist/doc/changelog.txt
+ dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.html
+ dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.txt
+
clean::
- rm -Rf $(AJ_ANT_HOME)
- rm -Rf $(AJ_JUNIT_HOME)
- rm -Rf $(AJ_COMMONS_HOME)
-
- rm -Rf $(MODULES)/lib/bcel/bcel*.jar
- (cd $(MODULES)/lib/ext/jrockit && rm -f jrockit.jar LICENSE.txt managementapi-jrockit81.jar)
-
- rm -Rf $(MODULES)/lib/asm
- rm -Rf $(MODULES)/lib/docbook
- rm -Rf $(MODULES)/lib/jdiff
- rm -Rf $(MODULES)/lib/jython
- rm -Rf $(MODULES)/lib/regexp
- rm -Rf $(MODULES)/lib/saxon
- rm -Rf $(MODULES)/lib/test
- rm -Rf $(MODULES)/docs/sandbox/aopalliance/aopalliance.jar
- rm -Rf $(MODULES)/docs/sandbox/aopalliance/lib/aj-aopalliance.jar
- rm -Rf $(MODULES)/docs/teaching/exercises/junit.jar
-
+ rm -Rf $(AJ_ECLIPSE_HOME)
+ rm -Rf $(AJ_BOOT_HOME)/lib/aspectj*.jar
+ rm -Rf $(AJ_ASM_HOME)/asm-3.1.jar
rm -f $(MODULES)/lib/gnu-classpath-tools-gjdoc.jar
-
rm -f $(DEB_BUILDDIR)/local.properties $(AJ_MANPAGES)
-
+ rm -Rf $(AJ_COMMONS_HOME)
+ rm -Rf $(AJ_JUNIT_HOME)
+ rm -Rf $(AJ_ANT_HOME)
rm -Rf $(MODULES)/aj-build
- $(MAKE) -f debian/rules clean-bootstrap
-
.PHONY: get-orig-source
get-orig-source:
sh debian/cvs-get.sh
Property changes on: trunk/aspectj/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/aspectj/debian/watch
===================================================================
--- trunk/aspectj/debian/watch 2009-07-26 10:58:54 UTC (rev 9395)
+++ trunk/aspectj/debian/watch 2009-07-26 22:10:08 UTC (rev 9396)
@@ -1,2 +1,2 @@
version=3
-http://www.eclipse.org/aspectj/downloads.php .*/tools/aspectj/downloads/aspectj-(.*).jar
+http://www.eclipse.org/aspectj/downloads.php .*/tools/aspectj/aspectj-([\d\.]+).jar
More information about the pkg-java-commits
mailing list