CVS ant/debian
Wolfgang B??r
wbaer-guest at haydn.debian.org
Wed Sep 21 18:39:34 UTC 2005
Update of /cvsroot/pkg-java/ant/debian
In directory haydn:/tmp/cvs-serv28102/debian
Modified Files:
README.Debian ant-doc.docs ant-doc.links ant.install ant.links
ant.properties changelog control rules
Added Files:
ant-doc.compress ant-doc.dirs ant-doc.doc-base.1
ant-doc.doc-base.2 ant-doc.linda.override ant-optional.dirs
ant-optional.install ant-optional.links ant.dirs
Removed Files:
ant.doc-base ant.docs
Log Message:
ant (1.6.5-2) unstable; urgency=low
* Converted package to no longer depend on libant1.6-java
* Reorganized binaries build from ant source package
* As part of this reorganization the following was done
* Completely revised README.Debian
* Registered javadoc and manual with doc-base
* Added the gjdoc task from libant1.6-java (closes: #324884)
--- /cvsroot/pkg-java/ant/debian/README.Debian 2005/08/07 22:19:17 1.6
+++ /cvsroot/pkg-java/ant/debian/README.Debian 2005/09/21 18:39:34 1.7
@@ -1,19 +1,29 @@
Ant 1.6 for Debian
==================
-- All JAR archives in /usr/share/ant/lib/ are appended to the class path
+ All JAR archives in /usr/share/ant/lib/ are appended to the classpath
before Ant is run. You can add symlinks there to automatically extend
Ant's CLASSPATH.
-- You need to add tools.jar from your JDK to your class path if you want to
- use the Java compiler or the native2ascii optional task. The easiest way
- to do this is to set the environment variable JAVA_HOME to the installation
- directory of your JDK. Ant will then automatically add
- $JAVA_HOME/lib/tools.jar to its class path.
+ Additional directories to be searched may be added by using the -lib
+ option. The -lib option specifies a search path. Any jars or classes
+ in the directories of the path will be added to Ant's classloader.
+
+ The order in which jars are added to the classpath is as follows:
+
+ -lib jars in the order specified by the -lib elements on the command line
+ jars from ${user.home}/.ant/lib (unless -nouserlib is set)
+ jars from ANT_HOME/lib
+
+ The need libraries for all optional tasks supported by the ant-optional
+ package are suggested during install. They are only suggested as there is
+ only a need to install a specific library if you use a specific optional
+ task. The library dependency for the optional tasks can be found in the
+ manual - which is provided by the ant-doc package.
-- Not all JARs from the original upstream distribution are part of the Debian
+ Not all JARs from the original upstream distribution are part of the Debian
package because the required libraries to build them have not been packaged
- yet. The missing archives are:
+ yet or are non-free packages. The missing archives are:
ant-xalan1 -- you can use ant-xalan2 with libxalan2-java instead
ant-xslp
@@ -25,23 +35,5 @@
ant-jai
ant-weblogic
-- The JARs ant-junit.jar and ant-trax.jar are symlinks to the versions in the
- libant1.6-java Debian package. ant.jar, ant-launcher.jar and ant-nodeps.jar
- are not used from there since the versions in this package contain additional
- classes that can not be built with packages in Debian's main section:
-
- ant.jar: org.apache.tools.ant.filters.util.JavaClassHelper
- org.apache.tools.ant.taskdefs.email.UUMailer
- org.apache.tools.ant.util.ScriptRunner
-
- ant-nodeps.jar: org.apache.tools.ant.taskdefs.optional.Javah
- org.apache.tools.ant.taskdefs.optional.Native2Ascii
-
- ant-launcher.jar can't be a symlink because Ant's automatic classpath builder
- would follow the symlink and wrongly add the JARs from /usr/share/ant1.6/lib/
- instead in /usr/share/ant/lib/.
-
-- All included JARs contain the same classes as upstream's binary distribution,
- except for ant-junit.jar which lacks Xalan1Executor and Xalan2Executor in
- org.apache.tools.ant.taskdefs.optional.junit.
-
+ Differences to upstream binary distribution for the build libraries:
+ + ant-junit.jar - lacks Xalan1Executor (use Xalan2Executor)
--- /cvsroot/pkg-java/ant/debian/ant-doc.docs 2005/08/07 22:19:17 1.4
+++ /cvsroot/pkg-java/ant/debian/ant-doc.docs 2005/09/21 18:39:34 1.5
@@ -1,2 +1,8 @@
build/javadocs
-
+docs/manual
+docs/images
+docs/*.html
+docs/*.css
+NOTICE
+README
+WHATSNEW
--- /cvsroot/pkg-java/ant/debian/ant-doc.links 2004/03/10 00:49:27 1.2
+++ /cvsroot/pkg-java/ant/debian/ant-doc.links 2005/09/21 18:39:34 1.3
@@ -1 +1 @@
-/usr/share/doc/ant-doc/javadocs /usr/share/doc/ant/manual/api
+/usr/share/doc/ant-doc/javadocs /usr/share/doc/ant-doc/manual/api
--- /cvsroot/pkg-java/ant/debian/ant.dirs 2004/03/10 00:49:27 1.3
+++ /cvsroot/pkg-java/ant/debian/ant.dirs 2005/09/21 18:39:34 1.4
@@ -1,5 +1,4 @@
usr/bin
usr/share/ant/bin
-usr/share/ant/etc
usr/share/ant/lib
usr/share/java
--- /cvsroot/pkg-java/ant/debian/ant.install 2005/08/07 22:19:17 1.4
+++ /cvsroot/pkg-java/ant/debian/ant.install 2005/09/21 18:39:34 1.5
@@ -1,20 +1,3 @@
-build/lib/ant-antlr.jar /usr/share/ant/lib/
-build/lib/ant-apache-bcel.jar /usr/share/ant/lib/
-build/lib/ant-apache-bsf.jar /usr/share/ant/lib/
-build/lib/ant-apache-log4j.jar /usr/share/ant/lib/
-build/lib/ant-apache-oro.jar /usr/share/ant/lib/
-build/lib/ant-apache-regexp.jar /usr/share/ant/lib/
-build/lib/ant-commons-logging.jar /usr/share/ant/lib/
-build/lib/ant-javamail.jar /usr/share/ant/lib/
-build/lib/ant-jdepend.jar /usr/share/ant/lib/
-build/lib/ant-launcher.jar /usr/share/ant/lib/
-build/lib/ant-nodeps.jar /usr/share/ant/lib/
-build/lib/ant-swing.jar /usr/share/ant/lib/
-build/lib/ant-jmf.jar /usr/share/ant/lib/
build/lib/ant.jar /usr/share/ant/lib/
-src/etc/*.xsl /usr/share/ant/etc/
-src/etc/checkstyle /usr/share/ant/etc/
-build/lib/ant-apache-resolver.jar /usr/share/ant/lib/
+build/lib/ant-launcher.jar /usr/share/ant/lib/
build/lib/ant-bootstrap.jar /usr/share/ant/lib/
-build/lib/ant-commons-net.jar /usr/share/ant/lib/
-build/lib/ant-jsch.jar /usr/share/ant/lib/
--- /cvsroot/pkg-java/ant/debian/ant.links 2004/06/06 17:16:31 1.6
+++ /cvsroot/pkg-java/ant/debian/ant.links 2005/09/21 18:39:34 1.7
@@ -1,3 +1,5 @@
/usr/share/ant/bin/ant /usr/bin/ant
-/usr/share/ant1.6/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
-/usr/share/ant1.6/lib/ant-trax.jar /usr/share/ant/lib/ant-trax.jar
+/usr/share/ant/lib/ant.jar /usr/share/java/ant-1.6.jar
+/usr/share/ant/lib/ant.jar /usr/share/java/ant.jar
+/usr/share/ant/lib/ant-launcher.jar /usr/share/java/ant-launcher.jar
+/usr/share/ant/lib/ant-bootstrap.jar /usr/share/java/ant-bootstrap.jar
--- /cvsroot/pkg-java/ant/debian/ant.properties 2005/08/07 22:19:17 1.1
+++ /cvsroot/pkg-java/ant/debian/ant.properties 2005/09/21 18:39:34 1.2
@@ -1,2 +1,5 @@
base64.present=true
sunuue.present=true
+offline=true
+javac.target=1.3
+javac.source=1.3
--- /cvsroot/pkg-java/ant/debian/changelog 2005/08/07 22:19:17 1.13
+++ /cvsroot/pkg-java/ant/debian/changelog 2005/09/21 18:39:34 1.14
@@ -1,3 +1,38 @@
+ant (1.6.5-2) unstable; urgency=low
+
+ * Converted package to no longer depend on libant1.6-java
+ + Dropped libant1.6-java from build-dep and deps
+ + ant.links - removed links into libant1.6-java
+ * Reorganized binaries build from ant source package
+ + ant - includes the scripts and the core tasks
+ + ant-doc - includes the manual and javadocs
+ + ant-optional - includes the optional tasks
+ * As part of this reorganization the following was done
+ + Moved core tasks previously in libant1.6-java to ant
+ + Moved optional tasks previously in ant to ant-optional
+ + Moved manual from ant to ant-doc
+ + Added conflicts,replaces with libant1.6-java to ant, ant-optional as
+ it contained core and optional task jars
+ + Added conflicts/replaces with ant-doc (<= 1.6.5-1) to ant
+ + Link all auxiliary jars from ant, ant-optional into /usr/share/java
+ as required by debian java policy
+ * Completely revised README.Debian
+ + Removed paragraph about setting JAVA_HOME which is not needed
+ (closes: #291157)
+ + Revised differences to upstream - we do not have any regressions
+ to building with non-free JDKs
+ + Added a paragraph about optional tasks and suggested libraries
+ * changelog.html in the ant manual is the description of an ant task
+ + Added linda override to suppress error html-only-changelog
+ + Added ant-doc.compress to suppress a gzip of this file
+ * Registered javadoc and manual with doc-base
+ Added ant-doc.doc-base.1 and ant-doc.doc-base.2
+ * Added the gjdoc task from libant1.6-java (closes: #324884)
+
+ * Upload sponsored by XXX
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 15 Aug 2005 15:17:36 +0200
+
ant (1.6.5-1) unstable; urgency=low
* New upstream release
--- /cvsroot/pkg-java/ant/debian/control 2005/08/07 22:19:17 1.13
+++ /cvsroot/pkg-java/ant/debian/control 2005/09/21 18:39:34 1.14
@@ -3,32 +3,43 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe, libant1.6-java, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
Standards-Version: 3.6.2
Package: ant
Architecture: all
Section: devel
Priority: optional
-Depends: kaffe | java1-runtime | java2-runtime, libant1.6-java (>= 1.6.5-1), libant1.6-java (<< 1.6.6), libxerces2-java
-Suggests: java-virtual-machine, ant-doc, jikes | java-compiler, libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
-Conflicts: ant-doc (<< 1.5.4-2)
-Replaces: ant-doc (<< 1.5.4-2)
+Depends: kaffe | java-virtual-machine, kaffe | java1-runtime | java2-runtime, libxerces2-java
+Recommends: ant-optional, jikes | java-compiler
+Suggests: ant-doc, libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
+Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
Description: Java based build tool like make
A system independent (i.e. not shell based) build tool that uses XML
- files as "Makefiles".
+ files as "Makefiles". This package contains the scripts and the core
+ tasks libraries.
.
For more information see http://ant.apache.org/index.html.
+Package: ant-optional
+Architecture: all
+Section: devel
+Priority: optional
+Depends: kaffe | java1-runtime | java2-runtime, ant (= ${Source-Version})
+Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Conflicts: libant1.6-java
+Replaces: libant1.6-java
+Description: Java based build tool like make - optional libraries
+ A system independent (i.e. not shell based) build tool that uses XML
+ files as "Makefiles". This package contains the optional tasks libraries.
+
Package: ant-doc
Architecture: all
Section: doc
Priority: optional
Suggests: ant
-Description: Java based build tool like make - API documentation
- A system independent (i.e. not shell based) build tool that uses XML
- files as "Makefiles".
- .
- This package contains the Javadoc API documentation.
- .
- For more information see http://ant.apache.org/index.html.
+Description: Java based build tool like make - API documentation and manual
+ A system independent (i.e. not shell based) build tool that uses XML files
+ as "Makefiles". This package contains the manual of ant as well as the
+ Javadoc API documentation.
--- /cvsroot/pkg-java/ant/debian/rules 2005/08/07 22:19:17 1.11
+++ /cvsroot/pkg-java/ant/debian/rules 2005/09/21 18:39:34 1.12
@@ -1,23 +1,37 @@
#!/usr/bin/make -f
# debian/rules file for ant (uses cdbs)
+#export DH_VERBOSE=1
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-# Java home directory and Ant home directory. This package uses the
-# libant*-java package to build so we don't need to bootstrap first
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant1.6
-# Additional JARs to add to the class path, either full path or just the
-# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS = ${ANT_HOME}/lib/ant-launcher.jar activation antlr bcel bsf commons-logging gnumail inetlib jdepend junit log4j-1.2 oro regexp xalan2 xml-commons-resolver-1.1 commons-net jsch
+# needs to be exported for direct ant call
+export JAVA_HOME := /usr/lib/kaffe
+# needed for bootstrap.sh
+export JAVAC=/usr/bin/jikes
+# needed for bootstrap
+export BOOTJAVAC_OPTS=-bootclasspath /usr/share/kaffe/Klasses.jar -source 1.3 -target 1.3 -nowarn
+
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ export ANT_OPTS=-Dbuild.compiler=jikes -Dcompile.debug=true -Dcompile.optimize=false
+else
+ export ANT_OPTS=-Dbuild.compiler=jikes -Dcompile.debug=true -Dcompile.optimize=true
+endif
+
+JAR_PATH := /usr/share/java
+CLASSPATH := ${CLASSPATH}:${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/gnumail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-commons-resolver-1.1.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar
+
+build:
+ # doing bootstrapping
+ ln -sf /usr/share/java/jaxp-1.2.jar lib/xml-apis.jar
+ ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar
+ /bin/sh bootstrap.sh
-DEB_ANT_COMPILER := jikes
+ # the rest
+ /bin/sh bootstrap/bin/ant -lib ${CLASSPATH} -propertyfile debian/ant.properties jars javadocs
-# Ant target to call
-DEB_ANT_BUILD_TARGET := jars javadocs
install/ant::
# Installing these files does not work with dh_install because of
@@ -26,7 +40,12 @@
install -m 755 src/script/ant debian/ant/usr/share/ant/bin
install -m 755 src/script/antRun debian/ant/usr/share/ant/bin
install -m 755 src/script/*.pl debian/ant/usr/share/ant/bin
- dh_installdocs -pant -XLICENSE docs/manual docs/images docs/*.html docs/*.css docs/*.js NOTICE README WHATSNEW
+
+install/ant-doc::
+ -rm -f docs/manual/LICENSE
+ # install linda override - the changelog is not a changelog but a task description
+ install -m 644 debian/ant-doc.linda.override debian/ant-doc/usr/share/linda/overrides/ant-doc
clean::
- -rm gjdoc_rawcomment.cache
+ -rm -f gjdoc_rawcomment.cache
+ -rm -rf bin bootstrap build lib/*.jar
More information about the pkg-java-commits
mailing list