r2220 - in trunk/ant/debian: . patches
Michael Koch
mkoch at costa.debian.org
Thu Jun 29 17:30:24 UTC 2006
Author: mkoch
Date: 2006-06-29 17:30:23 +0000 (Thu, 29 Jun 2006)
New Revision: 2220
Modified:
trunk/ant/debian/README.Debian
trunk/ant/debian/ant-doc.compress
trunk/ant/debian/ant-doc.dirs
trunk/ant/debian/ant-doc.doc-base.1
trunk/ant/debian/ant-doc.doc-base.2
trunk/ant/debian/ant-doc.docs
trunk/ant/debian/ant-doc.linda.override
trunk/ant/debian/ant-doc.links
trunk/ant/debian/ant-optional.dirs
trunk/ant/debian/ant-optional.install
trunk/ant/debian/ant-optional.links
trunk/ant/debian/ant.1
trunk/ant/debian/ant.dirs
trunk/ant/debian/ant.install
trunk/ant/debian/ant.links
trunk/ant/debian/ant.manpages
trunk/ant/debian/ant.properties
trunk/ant/debian/build.xml.5
trunk/ant/debian/changelog
trunk/ant/debian/compat
trunk/ant/debian/control
trunk/ant/debian/copyright
trunk/ant/debian/patches/01_ant_home_path.patch
trunk/ant/debian/patches/01_gjdoc_task.patch
trunk/ant/debian/patches/01_javadoc_maxmemory.patch
trunk/ant/debian/patches/02_ant_add_xerces.patch
trunk/ant/debian/patches/03_SplashTaskPatch_a.patch
trunk/ant/debian/patches/03_SplashTaskPatch_b.patch
trunk/ant/debian/patches/03_SplashTaskPatch_c.patch
trunk/ant/debian/patches/04_UUMailerReflection.patch
trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch
trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch
trunk/ant/debian/rules
trunk/ant/debian/watch
Log:
Remove duplicated lines.
Modified: trunk/ant/debian/README.Debian
===================================================================
--- trunk/ant/debian/README.Debian 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/README.Debian 2006-06-29 17:30:23 UTC (rev 2220)
@@ -37,42 +37,3 @@
Differences to upstream binary distribution for the build libraries:
+ ant-junit.jar - lacks Xalan1Executor (use Xalan2Executor)
-Ant 1.6 for Debian
-==================
-
- 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.
-
- 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
- package because the required libraries to build them have not been packaged
- yet or are non-free packages. The missing archives are:
-
- ant-xalan1 -- you can use ant-xalan2 with libxalan2-java instead
- ant-xslp
- ant-stylebook
- ant-icontract
- ant-netrexx
- ant-starteam
- ant-vaj
- ant-jai
- ant-weblogic
-
- Differences to upstream binary distribution for the build libraries:
- + ant-junit.jar - lacks Xalan1Executor (use Xalan2Executor)
Modified: trunk/ant/debian/ant-doc.compress
===================================================================
--- trunk/ant/debian/ant-doc.compress 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.compress 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,6 +1,3 @@
#!/bin/sh
echo usr/share/doc/ant-doc/WHATSNEW
echo usr/share/doc/ant-doc/changelog.Debian
-#!/bin/sh
-echo usr/share/doc/ant-doc/WHATSNEW
-echo usr/share/doc/ant-doc/changelog.Debian
Modified: trunk/ant/debian/ant-doc.dirs
===================================================================
--- trunk/ant/debian/ant-doc.dirs 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.dirs 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,2 +1 @@
usr/share/linda/overrides
-usr/share/linda/overrides
Modified: trunk/ant/debian/ant-doc.doc-base.1
===================================================================
--- trunk/ant/debian/ant-doc.doc-base.1 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.doc-base.1 2006-06-29 17:30:23 UTC (rev 2220)
@@ -8,13 +8,3 @@
Format: HTML
Index: /usr/share/doc/ant-doc/javadocs/index.html
Files: /usr/share/doc/ant-doc/javadocs/*.html
-Document: ant-doc1
-Title: Programmer API for ant (Java-based build system)
-Author: The Apache Ant Development Team
-Abstract: This is the programmer API of Ant, a system independent
- (i.e. not shell based) build tool that uses XML files as "Makefiles".
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/ant-doc/javadocs/index.html
-Files: /usr/share/doc/ant-doc/javadocs/*.html
Modified: trunk/ant/debian/ant-doc.doc-base.2
===================================================================
--- trunk/ant/debian/ant-doc.doc-base.2 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.doc-base.2 2006-06-29 17:30:23 UTC (rev 2220)
@@ -8,13 +8,3 @@
Format: HTML
Index: /usr/share/doc/ant-doc/index.html
Files: /usr/share/doc/ant-doc/*.html
-Document: ant-doc2
-Title: Manual for ant (Java-based build system)
-Author: The Apache Ant Development Team
-Abstract: This is the manual of Ant, a system independent (i.e. not shell
- based) build tool that uses XML files as "Makefiles".
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/ant-doc/index.html
-Files: /usr/share/doc/ant-doc/*.html
Modified: trunk/ant/debian/ant-doc.docs
===================================================================
--- trunk/ant/debian/ant-doc.docs 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.docs 2006-06-29 17:30:23 UTC (rev 2220)
@@ -6,11 +6,3 @@
NOTICE
README
WHATSNEW
-build/javadocs
-docs/manual
-docs/images
-docs/*.html
-docs/*.css
-NOTICE
-README
-WHATSNEW
Modified: trunk/ant/debian/ant-doc.linda.override
===================================================================
--- trunk/ant/debian/ant-doc.linda.override 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.linda.override 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,2 +1 @@
Tag: html-only-changelog
-Tag: html-only-changelog
Modified: trunk/ant/debian/ant-doc.links
===================================================================
--- trunk/ant/debian/ant-doc.links 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-doc.links 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,2 +1 @@
/usr/share/doc/ant-doc/javadocs /usr/share/doc/ant-doc/manual/api
-/usr/share/doc/ant-doc/javadocs /usr/share/doc/ant-doc/manual/api
Modified: trunk/ant/debian/ant-optional.dirs
===================================================================
--- trunk/ant/debian/ant-optional.dirs 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-optional.dirs 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,6 +1,3 @@
usr/share/ant/lib
usr/share/ant/etc
usr/share/java
-usr/share/ant/lib
-usr/share/ant/etc
-usr/share/java
Modified: trunk/ant/debian/ant-optional.install
===================================================================
--- trunk/ant/debian/ant-optional.install 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-optional.install 2006-06-29 17:30:23 UTC (rev 2220)
@@ -17,22 +17,3 @@
build/lib/ant-jsch.jar /usr/share/ant/lib/
build/lib/ant-junit.jar /usr/share/ant/lib/
build/lib/ant-trax.jar /usr/share/ant/lib/
-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-nodeps.jar /usr/share/ant/lib/
-build/lib/ant-swing.jar /usr/share/ant/lib/
-build/lib/ant-jmf.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-commons-net.jar /usr/share/ant/lib/
-build/lib/ant-jsch.jar /usr/share/ant/lib/
-build/lib/ant-junit.jar /usr/share/ant/lib/
-build/lib/ant-trax.jar /usr/share/ant/lib/
Modified: trunk/ant/debian/ant-optional.links
===================================================================
--- trunk/ant/debian/ant-optional.links 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant-optional.links 2006-06-29 17:30:23 UTC (rev 2220)
@@ -15,20 +15,3 @@
/usr/share/ant/lib/ant-jsch.jar /usr/share/java/ant-jsch.jar
/usr/share/ant/lib/ant-junit.jar /usr/share/java/ant-junit.jar
/usr/share/ant/lib/ant-trax.jar /usr/share/java/ant-trax.jar
-/usr/share/ant/lib/ant-antlr.jar /usr/share/java/ant-antlr.jar
-/usr/share/ant/lib/ant-apache-bcel.jar /usr/share/java/ant-apache-bcel.jar
-/usr/share/ant/lib/ant-apache-bsf.jar /usr/share/java/ant-apache-bsf.jar
-/usr/share/ant/lib/ant-apache-log4j.jar /usr/share/java/ant-apache-log4j.jar
-/usr/share/ant/lib/ant-apache-oro.jar /usr/share/java/ant-apache-oro.jar
-/usr/share/ant/lib/ant-apache-regexp.jar /usr/share/java/ant-apache-regexp.jar
-/usr/share/ant/lib/ant-commons-logging.jar /usr/share/java/ant-commons-logging.jar
-/usr/share/ant/lib/ant-javamail.jar /usr/share/java/ant-javamail.jar
-/usr/share/ant/lib/ant-jdepend.jar /usr/share/java/ant-jdepend.jar
-/usr/share/ant/lib/ant-nodeps.jar /usr/share/java/ant-nodeps.jar
-/usr/share/ant/lib/ant-swing.jar /usr/share/java/ant-swing.jar
-/usr/share/ant/lib/ant-jmf.jar /usr/share/java/ant-jmf.jar
-/usr/share/ant/lib/ant-apache-resolver.jar /usr/share/java/ant-apache-resolver.jar
-/usr/share/ant/lib/ant-commons-net.jar /usr/share/java/ant-commons-net.jar
-/usr/share/ant/lib/ant-jsch.jar /usr/share/java/ant-jsch.jar
-/usr/share/ant/lib/ant-junit.jar /usr/share/java/ant-junit.jar
-/usr/share/ant/lib/ant-trax.jar /usr/share/java/ant-trax.jar
Modified: trunk/ant/debian/ant.1
===================================================================
--- trunk/ant/debian/ant.1 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant.1 2006-06-29 17:30:23 UTC (rev 2220)
@@ -84,89 +84,3 @@
.SH AUTHOR
This manpage is written by Egon Willighagen <egonw at sci.kun.nl>
-.TH ant 1 "June 2005" "Debian/GNU Linux"
-.SH NAME
-ant \- a Java based make tool.
-
-.SH SYNOPSIS
-
-.B ant
-[\fIOPTIONS\fR] [\fITARGET\fR [\fITARGET2\fR [\fITARGET3\fR] ...\fR]\fR]
-
-.SH DESCRIPTION
-
-Like
-.B make
-.B ant
-is a tool by which projects can be build. But unlike it,
-.B ant
-is based on Java which means it will run on every platform
-for which a Java Virtual Machine is available. This makes it a great
-tool for building Java software.
-
-By default it takes information from
-.B build.xml
-which describes the targets.
-
-.TP
-\fB\-help, \-h\fR
-print help on the command line options
-.TP
-\fB\-projecthelp, \-p\fR
-print project help information
-.TP
-\fB\-version\fR
-print the version information
-.TP
-\fB\-diagnostics\fR
-print information that might be helpful to diagnose or report problems
-.TP
-\fB\-quiet, \-q\fR
-be extra quiet
-.TP
-\fB\-verbose, \-v\fR
-be extra verbose
-.TP
-\fB\-debug, \-d\fR
-print debugging information
-.TP
-\fB\-emacs, \-e\fR
-produce logging information without adornments
-.TP
-\fB\-lib\fR <\fIpath\fR>
-specifies a path to search for jars and classes
-.TP
-\fB\-logfile\fR <\fIfile\fR>
-use the given file to output log to
-.TP
-\fB\-logger\fR <\fIclassname\fR>
-use the given class to perform loggin
-.TP
-\fB\-listener\fR <\fIclassname\fR>
-add an instance of the given class as a project listener
-.TP
-\fB\-buildfile, \-file, \-f\fR <\fIfile\fR>
-use the given buildfile instead of the default
-.B build.xml
-file. This is the
-.B ant
-equivalent of
-.B Makefile
-.TP
-\fB\-D\fR<\fIproperty\fR>=<\fIvalue\fR>
-use value for the given property
-.TP
-\fB\-propertyfile\fR <\fIname\fR>
-load all properties from file with \-D properties taking precedence
-.TP
-\fB\-inputhandler\fR <\fIclass\fR>
-the class which will handle input requests
-.TP
-\fB\-nice\fR <\fInumber\fR>
-A niceness value for the main thread: 1 (lowest) to 10 (highest); 5 is the default
-
-.SH SEE ALSO
-.BR make (1)
-
-.SH AUTHOR
-This manpage is written by Egon Willighagen <egonw at sci.kun.nl>
Modified: trunk/ant/debian/ant.dirs
===================================================================
--- trunk/ant/debian/ant.dirs 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant.dirs 2006-06-29 17:30:23 UTC (rev 2220)
@@ -2,7 +2,3 @@
usr/share/ant/bin
usr/share/ant/lib
usr/share/java
-usr/bin
-usr/share/ant/bin
-usr/share/ant/lib
-usr/share/java
Modified: trunk/ant/debian/ant.install
===================================================================
--- trunk/ant/debian/ant.install 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant.install 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,6 +1,3 @@
build/lib/ant.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.jar /usr/share/ant/lib/
-build/lib/ant-launcher.jar /usr/share/ant/lib/
-build/lib/ant-bootstrap.jar /usr/share/ant/lib/
Modified: trunk/ant/debian/ant.links
===================================================================
--- trunk/ant/debian/ant.links 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant.links 2006-06-29 17:30:23 UTC (rev 2220)
@@ -3,8 +3,3 @@
/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
-/usr/share/ant/bin/ant /usr/bin/ant
-/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
Modified: trunk/ant/debian/ant.manpages
===================================================================
--- trunk/ant/debian/ant.manpages 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant.manpages 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,4 +1,2 @@
debian/ant.1
debian/build.xml.5
-debian/ant.1
-debian/build.xml.5
Modified: trunk/ant/debian/ant.properties
===================================================================
--- trunk/ant/debian/ant.properties 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/ant.properties 2006-06-29 17:30:23 UTC (rev 2220)
@@ -3,8 +3,3 @@
offline=true
javac.target=1.3
javac.source=1.3
-base64.present=true
-sunuue.present=true
-offline=true
-javac.target=1.3
-javac.source=1.3
Modified: trunk/ant/debian/build.xml.5
===================================================================
--- trunk/ant/debian/build.xml.5 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/build.xml.5 2006-06-29 17:30:23 UTC (rev 2220)
@@ -171,176 +171,3 @@
.SH AUTHOR
This manpage is made by Egon Willighagen <egonw at sci.kun.nl>
and based on the Ant Manual <\fIhttp://jakarta.apache.org/ant/manual/\fR>.
-.TH build.xml 5 "June 2005" "Debian/GNU Linux"
-.SH NAME
-build.xml \- configuration file used by ant to build projects
-
-.SH DESCRIPTION
-
-The file
-.B build.xml
-is the default configuration file used by
-.B ant
-to determine target to build for a specific project. It can be
-considered the ant equivalent of Makefile.
-
-The format of
-.B ant
-is XML and for each project a seperate file is constructed.
-The buildfile consists of one or more tasks. An example is
-given below.
-
-<project default="compile">
-
- <target name="compile">
- <javac srcdir="src">
- </target>
-
-</project>
-
-This example has one target and it is defaulted. The target itself
-consists of one task
-.B javac
-which compiles the files in the \fIsrc\fR directory.
-
-.SH TARGETS
-
-Targets can depend on other targets. These dependencies are given by
-the \fIdepends\fR attribute of the <\fItarget\fR> element.
-
-.SH TASKS
-
-A task is a piece of code that is executed.
-.B Ant
-recognizes built-in task, optional tasks, but one can also write new
-tasks.
-
-.B Built-in tasks
-
-The built-in tasks are: \fIAnt\fR, \fIAntCall\fR, \fIAntStructure\fR,
-\fIApply\fR, \fIAvailable\fR, \fIBasename\fR, \fIBuildNumber\fR,
-\fIBUnzip2\fR, \fIBZip2\fR, \fIChecksum\fR, \fIChmod\fR, \fIConcat\fR,
-\fICondition\fR, \fICopy\fR, \fICvs\fR, \fIDelete\fR, \fIDeltree\fR,
-\fIDirname\fR, \fIEar\fR, \fIEcho\fR, \fIExec\fR, \fIFail\fR, \fIFilter\fR,
-\fIFixCRLF\fR, \fIGenKey\fR, \fIGet\fR, \fIGUnzip\fR, \fIGZip\fR,
-\fIImport\fR, \fIInput\fR, \fIJar\fR, \fIJava\fR, \fIJavac\fR,
-\fIJavadoc\fR, \fILength\fR, \fILoadFile\fR, \fILoadProperties\fR,
-\fIMail\fR, \fIMkdir\fR, \fIMove\fR, \fINice\fR, \fIParallel\fR,
-\fIPatch\fR, \fIPathConvert\fR, \fIProperty\fR, \fIRecord\fR,
-\fIReplace\fR, \fIRmic\fR, \fISequential\fR, \fISignJar\fR, \fISleep\fR,
-\fISql\fR, \fIStyle\fR, \fISubant\fR, \fISync\fR, \fITar\fR, \fITaskdef\fR,
-\fITempfile\fR, \fITouch\fR, \fITStamp\fR, \fITypedef\fR, \fIUnjar\fR,
-\fIUntar\fR, \fIUnwar\fR, \fIUnzip\fR, \fIUptodate\fR, \fIWaitfor\fR,
-\fIWar\fR, \fIWhichResource\fR, \fIXmlProperty\fR, \fIXslt\fR, \fIZip\fR
-
-.TP
-\fBJava\fR
-Executes a Java class within the running (Ant) VM or forks another VM if
-specified. Below are some of the attibutes to the <\fIjava\fR> element:
-
-.B classname
-(required) the Java class to execute
-
-.B fork
-if enabled triggers the class execution in another VM (disabled by default)
-
-.B jvm
-the command used to invoke the Java Virtual Machine, default is
-\fIjava\fR. The command is resolved by java.lang.Runtime.exec().
-Ignored if fork is disabled.
-
-Other arguments are \fIclasspath\fR, \fIclasspathref\fR, \fImaxmemory\fR,
-\fIfailonerror\fR, \fIdir\fR and \fIoutput\fR.
-
-.TP
-\fBJavac\fR
-Compiles a source tree within the running (Ant) VM.
-
-.B srcdir
-(required) location of the java files
-
-.B destdir
-location to store the class files
-
-.B debug
-indicates whether source should be compiled
-with debug information; defaults to off
-
-.B optimize
-indicates whether source should be compiled
-with optimization; defaults to off
-
-.B target
-generate class files for specific VM version
-(e.g., 1.1 or 1.2).
-
-.B includes
-comma-separated list of patterns of files that
-must be included; all files are included when omitted
-
-.B excludes
-comma-separated list of patterns of files that
-must be excluded; no files (except default
-excludes) are excluded when omitted.
-
-.B defaultexcludes
-indicates whether default excludes should be
-used (yes | no); default excludes are used
-when omitted.
-
-Other arguments are \fIincludesfile\fR, \fIexcludesfile\fR,
-\fIclasspath\fR, \fIbootclasspath\fR, \fIclasspathref\fR,
-\fIbootclasspathref\fR, \fIextdirs\fR, \fIencoding\fR,
-\fIdeprecation\fR, \fIverbose\fR, \fIincludeAntRuntime\fR,
-\fIincludeJavaRuntime\fR and \fIfailonerror\fR.
-
-.SH Properties
-
-A project can have a set of properties, which consist of a name value
-combination. Within tasks they can be used by placing them between
-"${" and "}", as in "${builddir}/classes".
-
-.B Built-in Properties
-
-Ant provides access to all system properties as if they had been defined
-using a <\fIproperty\fR> task. For example, ${os.name} expands to the name of
-the operating system.
-
-.TP
-\fBbasedir\fR
-the absolute path of the project's basedir (as set
-with the basedir attribute of <project>).
-.TP
-\fBant.file\fR
-the absolute path of the buildfile.
-.TP
-\fBant.version\fR
-the version of Ant.
-.TP
-\fBant.project.name\fR
-the name of the project that is currently executing;
-it is set in the name attribute of <project>.
-.TP
-\fBant.java.version\fR
-the JVM version Ant detected; currently it can hold
-the values "1.1", "1.2" and "1.3".
-
-.SH Classpath
-
-The classpath can be set by using the <\fIclasspath\fR>
-element:
-
-<classpath>
- <pathelement path="${classpath}"/>
- <pathelement location="lib/helper.jar"/>
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
-</classpath>
-
-.SH SEE ALSO
-.BR ant (1)
-
-.SH AUTHOR
-This manpage is made by Egon Willighagen <egonw at sci.kun.nl>
-and based on the Ant Manual <\fIhttp://jakarta.apache.org/ant/manual/\fR>.
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/changelog 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,12 +1,3 @@
-ant (1.6.5-6) unstable; urgency=low
-
- * Rebuild with newer ecj to fix compilation bug (closes: #351076)
- * Added patch (02_RemoveManifestEntries.patch) to remove bogus
- classpath entry in ant-bootstrap.jar manifest file (closes: #353586)
- * Added patch from upstream to fix TarOutputStream problem (closes: #126477)
-
- -- Wolfgang Baer <WBaer at gmx.de> Fri, 7 Apr 2006 18:57:35 +0200
-
ant (1.6.5-5) unstable; urgency=low
* Added versioned build dependency on kaffe to fix the bootstrap process
@@ -383,379 +374,3 @@
* Initial Release
-- Stefan Gybas <sgybas at debian.org> Wed, 19 Jul 2000 12:50:39 +0200
-ant (1.6.5-5) unstable; urgency=low
-
- * Added versioned build dependency on kaffe to fix the bootstrap process
- (/usr/bin/ecj is only available sind 1.16.91-) (closes: #348647)
-
- -- Wolfgang Baer <WBaer at gmx.de> Wed, 18 Jan 2006 14:42:45 +0100
-
-ant (1.6.5-4) unstable; urgency=low
-
- * kaffe compiler transition
- * Applied patch for upstream PR 38260 to fix build failure
- of some package on free runtimes (Thanks, Stephan Michels)
-
- -- Wolfgang Baer <WBaer at gmx.de> Mon, 16 Jan 2006 12:17:10 +0100
-
-ant (1.6.5-3) unstable; urgency=low
-
- * Fixed FTBS by adding bootstrap ANT_HOME (closes: #331081)
- * Add javacc to Suggests as needed by javacc task (closes: #330513)
-
- -- Wolfgang Baer <WBaer at gmx.de> Sat, 1 Oct 2005 17:15:35 +0200
-
-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 Arnaud Vandyck <avdyk at debian.org>
-
- -- 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
- + Build with kaffe/gjdoc/jikes
- + Move to main (closes: #290228)
- + Refractored SplashTask to remove sun internal classes
- patches 03_SplashTaskPatch_a/b/c.patch (submitted upstream)
- + Patched UUMailer.java to use sun internal classes via reflection
- + Updated src/script/ant patches
- + Patched build.xml to include maxmemory option to build javadoc
- * Splashscreen now works with kaffe/gij-4.0/jamvm packages
- (closes: #169755, #164401)
- * Removed extraneous files left by failed builds (closes: #310266)
- * Added libjsch-java to path and include ant-jsch (closes: #305674)
- * Added ant-jmf to ant.install
- * Added java1-runtime | java2-runtime as alternatives to kaffe to Depends
- * Moved ant-doc to section doc (closes: #253448)
- * According to upstream changelog ant junitreport for JDK 1.5
- was fixed already in 1.6.2 (closes: #273560)
- * Taskdef attributes are the same as for Typedef and therefore
- described through the provided link to Typedef manual (closes: #254683)
- * Updated README.Debian
- * Updated build.xml.5 and ant.1 manpages
- * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
- * Moved java-virtual-machine to suggests
- * Used versioned dependency for libant1.6-java (same upstream version needed)
- * Call dh_installdocs directly to exclude redundant LICENSE files
- * Bumped Standards-Version to 3.6.2 - no changes
- * Added myself to uploaders
- * Upload sponsored by Arnaud Vandyck
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 23 Jun 2005 16:11:44 +0200
-
-ant (1.6.2-2) unstable; urgency=low
-
- * added commons-net to the path when building (closes: #272556).
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 28 Sep 2004 11:44:52 +0200
-
-ant (1.6.2-1) unstable; urgency=low
-
- * New upstream release
- * debian/watch: added file to monitor new upstream
- * debian/ant.install: changed name of some libs (they changed it
- upstream): ant-apache-bcel.jar, ant-apache-log4j, ant-apache-oro.jar,
- ant-apache-regexp.jar
- * debian/ant.install: added ant-apache-resolver.jar, ant-bootstrap.jar
- and ant-commons-net.jar (/usr/share/ant/lib)
- * debian/ant.install: removed ant-xalan2.jar (does not exist anymore
- upstream!)
-
- -- Arnaud Vandyck <arnaud at ressource-toi.org> Sun, 15 Aug 2004 00:50:34 +0200
-
-ant (1.6.1-2) unstable; urgency=low
-
- * Add the Xerces2 XML parser to the local classpath
- (closes: #240245, #249136)
- * Don't make /usr/share/ant/lib/ant-launcher.jar a symlink since Ant's
- startup code would follow it and wrongly add JARs from
- /usr/share/ant1.6/lib instead of /usr/share/ant/lib to the classpath
- (closes: #238674, #239797, #251527, #238187, #245042)
- * Correctly set ANT_HOME in /usr/bin/ant
-
- -- Stefan Gybas <sgybas at debian.org> Sun, 6 Jun 2004 18:55:09 +0200
-
-ant (1.6.1-1) unstable; urgency=low
-
- * New upstream release (closes: #230061)
- + Uses the new interface to BSF (closes: #217752)
- + Fixes bug in finding javacc.jar (closes: #232592)
- * Only suggest the libraries for optional tasks instead of depending on
- them (closes: #211560, #228142)
- * Build with the packaged version of ORO (closes: #200909)
- * Fixed typo in ant.1 man page (closes: #215291). Thanks to Nicolas Francois
- for the patch!
- * Updated copyright to include the new Apache License version 2.0
- * Use upstream's version of the Ant wrapper /usr/bin/ant which uses the
- new ant-launcher.jar
- * Updated README.Debian
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 10 Mar 2004 01:47:53 +0100
-
-ant (1.5.4-3) unstable; urgency=low
-
- * The ant package now conflicts with and replaces ant-doc (<< 1.5.4-2)
- (closes: #211234)
- * Use CDBS to build the package
- * Set Maintainer to Debian Java Maintainers
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 17 Sep 2003 15:00:17 +0200
-
-ant (1.5.4-2) unstable; urgency=low
-
- * Remove ant.jar and depend on libant1.5-java instead
- * Move all documentation expect the Javadoc API documentation from ant-doc
- to ant (closes: #174876)
- * Install the XSL files in /usr/share/ant/etc/ (closes: #205484)
- * Standards-Version: 3.6.1 (no changes required)
-
- -- Stefan Gybas <sgybas at debian.org> Sun, 7 Sep 2003 17:26:14 +0200
-
-ant (1.5.4-1) unstable; urgency=low
-
- * New upstream release
- * Modify the build process so that no changes to build.xml and bootstrap.sh
- are required
- * Build JDepend task (closes: #203149)
- * Added a list of missing classes in ant-optional.jar compared to upstream's
- optional.jar to README.Debian
- * Standards-Version: 3.6.0
- + Moved debhelper from Build-Depends-Indep: to Build-Depends:
-
- -- Stefan Gybas <sgybas at debian.org> Thu, 14 Aug 2003 11:57:48 +0200
-
-ant (1.5.3-2) unstable; urgency=low
-
- * Add xmlParserAPIs.jar from Xalan2 to the class path instead of xml-apis.jar
- from Xerces2 (closes: #195702)
- * Don't compress manual/CoreTasks/changelog.html and other files in ant-doc
- (closes: #159963)
- * Depend on the previously suggested packages jython and antlr to avoid
- dangling symlinks in /usr/share/ant/lib
- * Honor $ANT_ARGS in startup script (closes: #174313)
- * Added dependency on java*-runtime as required by the Java Policy
- * Enable support for BCEL and Commons Logging (closes: #179177)
- * Compile using Blackdown's JDK 1.4 runtime classes to make sure that the
- Javah task gets built (closes: #182918)
- * Depend on liblog4j1.2-java instead of liblog4j (closes: #191177)
- * Fixed handling of target names with spaces (closes: #198481)
- * Updated upstream URL in copyright and package description
- * Fixed Lintian errors and warnings:
- + Removed extra license in ant-doc
- + Fixed bad whatis entry in manual pages
- * Updated README.Debian
- * Standards-Version: 3.5.10 (no changes required)
-
- -- Stefan Gybas <sgybas at debian.org> Tue, 24 Jun 2003 16:21:44 +0200
-
-ant (1.5.3-1) unstable; urgency=low
-
- * New upstream release
-
- -- Takashi Okamoto <tora at debian.org> Wed, 9 Apr 2003 21:32:28 +0900
-
-ant (1.5.1-1) unstable; urgency=low
-
- * New upstream release
- * Build with debhelper >= 4.1.0 to get rid of /usr/doc compatibility
- symlinks
- * Standards-Version: 3.5.7 (no changes required)
- * Added Takashi Okamoto and Ola Lundqvist as uploaders
- * Build with jikes as a first step in a movement from contrib to main
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 23 Oct 2002 16:07:15 +0200
-
-ant (1.5-1) unstable; urgency=low
-
- * New upstream release
-
- -- Stefan Gybas <sgybas at debian.org> Thu, 11 Jul 2002 23:02:20 +0200
-
-ant (1.4.99b3-1) unstable; urgency=low
-
- * New upstream release: Ant 1.5beta3
- + calles com.sun.tools.javac.Main when using the modern Java compiler
- (closes: #147466)
- * Build using Xerces-J 2.0 like upstream does
- * Build depend on recent Xalan-J 2.0 version so that the style task works
- with TrAX (closes: #148997)
- * Depend on some of the previously suggested packages (Xalan-J, JUnit)
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 3 Jul 2002 17:24:11 +0200
-
-ant (1.4.99b1-1) unstable; urgency=low
-
- * New upstream release: Ant 1.5beta1
- + supports Java 1.4 taglets in javadoc task (closes: #138648)
- * Fixed spelling error in doc-base title (closes: #144274)
- * Add a note to README.Debian about additional dependencies for some
- optional tasks (closes: #139188)
- * Add a note to README.Debian about dangling symlinks in
- /usr/share/ant/lib (closes: #138638)
- * Build using Xerces 1 and Xalan 1 until the problems with Xalan 2 are
- resolved
- * Use DH_COMPAT=4 in debian/rules and update build dependencies accordingly
-
- -- Stefan Gybas <sgybas at debian.org> Sun, 26 May 2002 18:31:38 +0200
-
-ant (1.4.1-4) unstable; urgency=low
-
- * Applied patch from Adam Heath to not follow symlinks during deletion
- (closes: #133291)
- * Copy the Ant startup script to /usr/share/ant/bin/ant (closes: #133641)
- * Provide the upstream chaneglog (WHATSNEW)
- * The package can now be compiled with j2sdk1.3 1.3.1-1.1 (which has
- JAVA_HOME set to /usr/lib/j2se/1.3) and 1.3.1-1 (which has JAVA_HOME set
- to /usr/lib/j2sdk1.3).
-
- -- Stefan Gybas <sgybas at debian.org> Thu, 14 Feb 2002 14:28:48 +0100
-
-ant (1.4.1-3) unstable; urgency=low
-
- * Correctly set classpath (closes: #132027)
- * Install API doc into manual/api so that links work (closes: #132012)
- * Fixed typos in previous changelog entry
-
- -- Stefan Gybas <sgybas at debian.org> Sun, 3 Feb 2002 11:28:35 +0100
-
-ant (1.4.1-2) unstable; urgency=low
-
- * Removed empty line from src/main/org/apache/tools/ant/defaultManifest.mf.
- Thanks to Ken Harris and Marko Kreen for investigation! (closes: #112261)
- * Use $JAVA_HOME/bin/java instead of /usr/bin/java if the former
- exists, Thanks to Taso Lyristis for the patch!
- * Respect $JAVACMD and $ANT_OPTS in /usr/bin/ant as the documentation
- says. Thanks to Marko Kreen for the patch! (closes: #119611)
- * Only append JAR files in /usr/share/ant/lib/ to the CLASSPATH if
- the file actually exists to avoid problems with dangling symlinks
- * Include symlinks to optional JARs from other packages into the package
- instead of creating them in the postinst. However, ant still only
- suggests these packages. (closes: #124378)
- * Also include symlink to js.jar from rhino. (closes: #130624)
- * Check the length of osname in src/main/org/apache/tools/tar/TarEntry.java
- to avoid StringIndexOutOfBoundsException on Linux. (closes: #126479)
- * Added getMode() to src/main/org/apache/tools/tar/TarEntry.java, taken
- from upstream CVS. (closes: #126472)
- * Build API docs and put them together with the HTML manual in the new
- ant-doc package (closes: #125144)
- * Install the JARs as /usr/share/java/ant-$version-*.jar and create
- /usr/share/java/ant-*.jar symlinks as recommended by the Java policy
- * Use dh_installman instead of dh_installmanpages so ant.1 and build.5
- are only included in the main package
- * Make ant-doc conflict with previous versions of ant because of
- overlapping files
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 30 Jan 2002 09:45:06 +0100
-
-ant (1.4.1-1) unstable; urgency=low
-
- * New upstream release with fixed JAR generation (closes: #112261)
- * Use /usr/lib/j2se/1.3 for JAVA_HOME (for j2sdk1.3 from Incoming)
- * Removed emacs settings from changelog (Lintian)
- * Changed Build-Depends to Build-Depends-Indep (Lintian)
-
- -- Stefan Gybas <sgybas at debian.org> Tue, 23 Oct 2001 22:31:57 +0200
-
-ant (1.4-1) unstable; urgency=low
-
- * New upstream release
- * Use libxalan2-java instad of libxalan-java
- * Build support for liblog4j and libregexp-java
- * Suggest jython and include its JAR in Ant's class path so Python
- can be used in the <script> task
-
- -- Stefan Gybas <sgybas at debian.org> Thu, 13 Sep 2001 12:09:10 +0200
-
-ant (1.3-4) unstable; urgency=low
-
- * Built using Sun's javac instead of jikes (closes: #107326)
-
- -- Stefan Gybas <sgybas at debian.org> Fri, 24 Aug 2001 16:46:53 +0200
-
-ant (1.3-3) unstable; urgency=low
-
- * Built Ant using JMF, JUnit, Xalan and ANTLR so some extra tags are
- supported in build.xml
- * Add optional packages to CLASSPATH at installation time if they are
- installed
-
- -- Stefan Gybas <sgybas at debian.org> Mon, 30 Jul 2001 23:33:15 +0200
-
-ant (1.3-2) unstable; urgency=low
-
- * Also move binary package to contrib
-
- -- Stefan Gybas <sgybas at debian.org> Fri, 27 Jul 2001 00:45:46 +0200
-
-ant (1.3-1) unstable; urgency=low
-
- * New upstream release (closes: #95866)
- * Build using j2dsk1.3 instead of kaffe because kaffe lacks too many
- JDK 1.2 features and is too buggy to even run Ant. Unfortunately, this
- requires moving ant from main to contrib but it fixes many Ant
- problems. (closes: #105737)
- * Use debhelper V3
- * Standards-Version: 3.5.6 (no changes required)
- * Call bootstraop.sh to build ant, this fixes the problem with missing
- files in the resulting ant.jar (closes: #85802, #90023, #90024, #93400,
- #98207, #106468)
- * Include man pages ant.1 and build.xml.5, thanks to Egon Willighagen
- (closes: #92975)
- * Add tools.jar to Ant's classpath if $JAVA_HOME is defined
- * Updated README.Debian
- * Build using libbsf-java and liboro-java so advanced features can be used.
- Added suggestions for these packages.
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 25 Jul 2001 22:48:52 +0200
-
-ant (1.2-1) unstable; urgency=low
-
- * New upstream release
- * Build classpath from all JARs in /usr/share/ant/lib/
-
- -- Stefan Gybas <sgybas at debian.org> Tue, 21 Nov 2000 21:36:34 +0100
-
-ant (1.1-2) unstable; urgency=low
-
- * Build using new Xerces-J 1.2.0 version
- * Add symlink to ant.jar in /usr/share/ant/lib
- * Updated debian/rules to use debhelper V2
- * Updated to Standards-Version: 3.2.1 (no changes required)
-
- -- Stefan Gybas <sgybas at debian.org> Mon, 25 Sep 2000 20:58:06 +0200
-
-ant (1.1-1) unstable; urgency=low
-
- * Initial Release
-
- -- Stefan Gybas <sgybas at debian.org> Wed, 19 Jul 2000 12:50:39 +0200
Modified: trunk/ant/debian/compat
===================================================================
--- trunk/ant/debian/compat 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/compat 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,2 +1 @@
4
-4
Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/control 2006-06-29 17:30:23 UTC (rev 2220)
@@ -43,48 +43,3 @@
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.
-Source: ant
-Section: devel
-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>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.0), kaffe (>= 2:1.1.6.91-1), 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 | java-virtual-machine, kaffe | java1-runtime | java2-runtime, libxerces2-java
-Recommends: ant-optional, jikes | java-compiler
-Suggests: ant-doc
-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". 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, javacc
-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 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.
Modified: trunk/ant/debian/copyright
===================================================================
--- trunk/ant/debian/copyright 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/copyright 2006-06-29 17:30:23 UTC (rev 2220)
@@ -217,222 +217,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-This package was debianized by Stefan Gybas <sgybas at debian.org> on 19-May-2000.
-The source code was downloaded from http://ant.apache.org/.
-
-Home page, download location:
-
- http://ant.apache.org/
- http://www.apache.org/dist/ant/source/
-
-
-Authors:
-
- The Apache Ant team, see http://ant.apache.org/contributors.html for details
-
-
-Copyright:
-
-/*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/
- *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- * 1. Definitions.
- *
- * "License" shall mean the terms and conditions for use, reproduction,
- * and distribution as defined by Sections 1 through 9 of this document.
- *
- * "Licensor" shall mean the copyright owner or entity authorized by
- * the copyright owner that is granting the License.
- *
- * "Legal Entity" shall mean the union of the acting entity and all
- * other entities that control, are controlled by, or are under common
- * control with that entity. For the purposes of this definition,
- * "control" means (i) the power, direct or indirect, to cause the
- * direction or management of such entity, whether by contract or
- * otherwise, or (ii) ownership of fifty percent (50%) or more of the
- * outstanding shares, or (iii) beneficial ownership of such entity.
- *
- * "You" (or "Your") shall mean an individual or Legal Entity
- * exercising permissions granted by this License.
- *
- * "Source" form shall mean the preferred form for making modifications,
- * including but not limited to software source code, documentation
- * source, and configuration files.
- *
- * "Object" form shall mean any form resulting from mechanical
- * transformation or translation of a Source form, including but
- * not limited to compiled object code, generated documentation,
- * and conversions to other media types.
- *
- * "Work" shall mean the work of authorship, whether in Source or
- * Object form, made available under the License, as indicated by a
- * copyright notice that is included in or attached to the work
- * (an example is provided in the Appendix below).
- *
- * "Derivative Works" shall mean any work, whether in Source or Object
- * form, that is based on (or derived from) the Work and for which the
- * editorial revisions, annotations, elaborations, or other modifications
- * represent, as a whole, an original work of authorship. For the purposes
- * of this License, Derivative Works shall not include works that remain
- * separable from, or merely link (or bind by name) to the interfaces of,
- * the Work and Derivative Works thereof.
- *
- * "Contribution" shall mean any work of authorship, including
- * the original version of the Work and any modifications or additions
- * to that Work or Derivative Works thereof, that is intentionally
- * submitted to Licensor for inclusion in the Work by the copyright owner
- * or by an individual or Legal Entity authorized to submit on behalf of
- * the copyright owner. For the purposes of this definition, "submitted"
- * means any form of electronic, verbal, or written communication sent
- * to the Licensor or its representatives, including but not limited to
- * communication on electronic mailing lists, source code control systems,
- * and issue tracking systems that are managed by, or on behalf of, the
- * Licensor for the purpose of discussing and improving the Work, but
- * excluding communication that is conspicuously marked or otherwise
- * designated in writing by the copyright owner as "Not a Contribution."
- *
- * "Contributor" shall mean Licensor and any individual or Legal Entity
- * on behalf of whom a Contribution has been received by Licensor and
- * subsequently incorporated within the Work.
- *
- * 2. Grant of Copyright License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * copyright license to reproduce, prepare Derivative Works of,
- * publicly display, publicly perform, sublicense, and distribute the
- * Work and such Derivative Works in Source or Object form.
- *
- * 3. Grant of Patent License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * (except as stated in this section) patent license to make, have made,
- * use, offer to sell, sell, import, and otherwise transfer the Work,
- * where such license applies only to those patent claims licensable
- * by such Contributor that are necessarily infringed by their
- * Contribution(s) alone or by combination of their Contribution(s)
- * with the Work to which such Contribution(s) was submitted. If You
- * institute patent litigation against any entity (including a
- * cross-claim or counterclaim in a lawsuit) alleging that the Work
- * or a Contribution incorporated within the Work constitutes direct
- * or contributory patent infringement, then any patent licenses
- * granted to You under this License for that Work shall terminate
- * as of the date such litigation is filed.
- *
- * 4. Redistribution. You may reproduce and distribute copies of the
- * Work or Derivative Works thereof in any medium, with or without
- * modifications, and in Source or Object form, provided that You
- * meet the following conditions:
- *
- * (a) You must give any other recipients of the Work or
- * Derivative Works a copy of this License; and
- *
- * (b) You must cause any modified files to carry prominent notices
- * stating that You changed the files; and
- *
- * (c) You must retain, in the Source form of any Derivative Works
- * that You distribute, all copyright, patent, trademark, and
- * attribution notices from the Source form of the Work,
- * excluding those notices that do not pertain to any part of
- * the Derivative Works; and
- *
- * (d) If the Work includes a "NOTICE" text file as part of its
- * distribution, then any Derivative Works that You distribute must
- * include a readable copy of the attribution notices contained
- * within such NOTICE file, excluding those notices that do not
- * pertain to any part of the Derivative Works, in at least one
- * of the following places: within a NOTICE text file distributed
- * as part of the Derivative Works; within the Source form or
- * documentation, if provided along with the Derivative Works; or,
- * within a display generated by the Derivative Works, if and
- * wherever such third-party notices normally appear. The contents
- * of the NOTICE file are for informational purposes only and
- * do not modify the License. You may add Your own attribution
- * notices within Derivative Works that You distribute, alongside
- * or as an addendum to the NOTICE text from the Work, provided
- * that such additional attribution notices cannot be construed
- * as modifying the License.
- *
- * You may add Your own copyright statement to Your modifications and
- * may provide additional or different license terms and conditions
- * for use, reproduction, or distribution of Your modifications, or
- * for any such Derivative Works as a whole, provided Your use,
- * reproduction, and distribution of the Work otherwise complies with
- * the conditions stated in this License.
- *
- * 5. Submission of Contributions. Unless You explicitly state otherwise,
- * any Contribution intentionally submitted for inclusion in the Work
- * by You to the Licensor shall be under the terms and conditions of
- * this License, without any additional terms or conditions.
- * Notwithstanding the above, nothing herein shall supersede or modify
- * the terms of any separate license agreement you may have executed
- * with Licensor regarding such Contributions.
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- * names, trademarks, service marks, or product names of the Licensor,
- * except as required for reasonable and customary use in describing the
- * origin of the Work and reproducing the content of the NOTICE file.
- *
- * 7. Disclaimer of Warranty. Unless required by applicable law or
- * agreed to in writing, Licensor provides the Work (and each
- * Contributor provides its Contributions) on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied, including, without limitation, any warranties or conditions
- * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- * PARTICULAR PURPOSE. You are solely responsible for determining the
- * appropriateness of using or redistributing the Work and assume any
- * risks associated with Your exercise of permissions under this License.
- *
- * 8. Limitation of Liability. In no event and under no legal theory,
- * whether in tort (including negligence), contract, or otherwise,
- * unless required by applicable law (such as deliberate and grossly
- * negligent acts) or agreed to in writing, shall any Contributor be
- * liable to You for damages, including any direct, indirect, special,
- * incidental, or consequential damages of any character arising as a
- * result of this License or out of the use or inability to use the
- * Work (including but not limited to damages for loss of goodwill,
- * work stoppage, computer failure or malfunction, or any and all
- * other commercial damages or losses), even if such Contributor
- * has been advised of the possibility of such damages.
- *
- * 9. Accepting Warranty or Additional Liability. While redistributing
- * the Work or Derivative Works thereof, You may choose to offer,
- * and charge a fee for, acceptance of support, warranty, indemnity,
- * or other liability obligations and/or rights consistent with this
- * License. However, in accepting such obligations, You may act only
- * on Your own behalf and on Your sole responsibility, not on behalf
- * of any other Contributor, and only if You agree to indemnify,
- * defend, and hold each Contributor harmless for any liability
- * incurred by, or claims asserted against, such Contributor by reason
- * of your accepting any such warranty or additional liability.
- *
- * END OF TERMS AND CONDITIONS
- *
- * APPENDIX: How to apply the Apache License to your work.
- *
- * To apply the Apache License to your work, attach the following
- * boilerplate notice, with the fields enclosed by brackets "[]"
- * replaced with your own identifying information. (Don't include
- * the brackets!) The text should be enclosed in the appropriate
- * comment syntax for the file format. We also recommend that a
- * file or class name and description of purpose be included on the
- * same "printed page" as the copyright notice for easier
- * identification within third-party archives.
- *
- * Copyright [yyyy] [name of copyright owner]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
Modified: trunk/ant/debian/patches/01_ant_home_path.patch
===================================================================
--- trunk/ant/debian/patches/01_ant_home_path.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/01_ant_home_path.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -29,34 +29,3 @@
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
---- src/script/ant.orig 2005-05-19 14:40:48.000000000 +0200
-+++ src/script/ant 2005-06-23 16:00:12.000000000 +0200
-@@ -87,25 +87,9 @@
- esac
-
- if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
-- ## resolve links - $0 may be a link to ant's home
-- PRG="$0"
-- progname=`basename "$0"`
--
-- # need this for relative symlinks
-- while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '/.*' > /dev/null; then
-- PRG="$link"
-- else
-- PRG=`dirname "$PRG"`"/$link"
-- fi
-- done
--
-- ANT_HOME=`dirname "$PRG"`/..
--
-- # make it fully qualified
-- ANT_HOME=`cd "$ANT_HOME" && pwd`
-+ if [ -d /usr/share/ant ] ; then
-+ ANT_HOME=/usr/share/ant
-+ fi
- fi
-
- # For Cygwin, ensure paths are in UNIX format before anything is touched
Modified: trunk/ant/debian/patches/01_gjdoc_task.patch
===================================================================
--- trunk/ant/debian/patches/01_gjdoc_task.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/01_gjdoc_task.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -2159,2164 +2159,3 @@
+ }
+
+}
-diff -uNr src.orig/main/org/apache/tools/ant/taskdefs/defaults.properties src/main/org/apache/tools/ant/taskdefs/defaults.properties
---- src.orig/main/org/apache/tools/ant/taskdefs/defaults.properties 2004-01-14 20:32:29.000000000 +0900
-+++ src/main/org/apache/tools/ant/taskdefs/defaults.properties 2004-01-14 20:33:04.000000000 +0900
-@@ -14,6 +14,7 @@
- unwar=org.apache.tools.ant.taskdefs.Expand
- echo=org.apache.tools.ant.taskdefs.Echo
- javadoc=org.apache.tools.ant.taskdefs.Javadoc
-+gjdoc=org.apache.tools.ant.taskdefs.Gjdoc
- zip=org.apache.tools.ant.taskdefs.Zip
- gzip=org.apache.tools.ant.taskdefs.GZip
- gunzip=org.apache.tools.ant.taskdefs.GUnzip
-diff -uNr src.orig/main/org/apache/tools/ant/taskdefs/Gjdoc.java src/main/org/apache/tools/ant/taskdefs/Gjdoc.java
---- src.orig/main/org/apache/tools/ant/taskdefs/Gjdoc.java 1970-01-01 01:00:00.000000000 +0100
-+++ src/main/org/apache/tools/ant/taskdefs/Gjdoc.java 2005-05-21 16:28:09.000000000 +0200
-@@ -0,0 +1,2146 @@
-+/*
-+ * Copyright 2000-2005 The Apache Software Foundation
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ *
-+ */
-+package org.apache.tools.ant.taskdefs;
-+
-+import java.io.File;
-+import java.io.FileWriter;
-+import java.io.FilenameFilter;
-+import java.io.IOException;
-+import java.io.PrintWriter;
-+import java.io.BufferedReader;
-+import java.io.FileReader;
-+import java.net.MalformedURLException;
-+import java.net.URL;
-+import java.util.Enumeration;
-+import java.util.Locale;
-+import java.util.StringTokenizer;
-+import java.util.Vector;
-+import org.apache.tools.ant.BuildException;
-+import org.apache.tools.ant.DirectoryScanner;
-+import org.apache.tools.ant.Project;
-+import org.apache.tools.ant.ProjectComponent;
-+import org.apache.tools.ant.Task;
-+import org.apache.tools.ant.types.Commandline;
-+import org.apache.tools.ant.types.DirSet;
-+import org.apache.tools.ant.types.EnumeratedAttribute;
-+import org.apache.tools.ant.types.FileSet;
-+import org.apache.tools.ant.types.Path;
-+import org.apache.tools.ant.types.PatternSet;
-+import org.apache.tools.ant.types.Reference;
-+import org.apache.tools.ant.util.FileUtils;
-+import org.apache.tools.ant.util.JavaEnvUtils;
-+
-+/**
-+ * Generates Javadoc documentation for a collection
-+ * of source code. It used the Gjdoc tool from GNU classpath.
-+ *
-+ * <P>Current known limitations are:
-+ *
-+ * <P><UL>
-+ * <LI>patterns must be of the form "xxx.*", every other pattern doesn't
-+ * work.
-+ * <LI>there is no control on arguments sanity since they are left
-+ * to the javadoc implementation.
-+ * </UL>
-+ *
-+ * <P>If no <CODE>doclet</CODE> is set, then the <CODE>version</CODE> and
-+ * <CODE>author</CODE> are by default <CODE>"yes"</CODE>.
-+ *
-+ * <P>Note: This task is run on another VM because the Javadoc code calls
-+ * <CODE>System.exit()</CODE> which would break Ant functionality.
-+ *
-+ *
-+ * @since Ant 1.1
-+ *
-+ * @ant.task category="java"
-+ */
-+public class Gjdoc extends Task {
-+ /**
-+ * Inner class used to manage doclet parameters.
-+ */
-+ public class DocletParam {
-+ /** The parameter name */
-+ private String name;
-+
-+ /** The parameter value */
-+ private String value;
-+
-+ /**
-+ * Set the name of the parameter.
-+ *
-+ * @param name the name of the doclet parameter
-+ */
-+ public void setName(String name) {
-+ this.name = name;
-+ }
-+
-+ /**
-+ * Get the parameter name.
-+ *
-+ * @return the parameter's name.
-+ */
-+ public String getName() {
-+ return name;
-+ }
-+
-+ /**
-+ * Set the parameter value.
-+ *
-+ * Note that only string values are supported. No resolution of file
-+ * paths is performed.
-+ *
-+ * @param value the parameter value.
-+ */
-+ public void setValue(String value) {
-+ this.value = value;
-+ }
-+
-+ /**
-+ * Get the parameter value.
-+ *
-+ * @return the parameter value.
-+ */
-+ public String getValue() {
-+ return value;
-+ }
-+ }
-+
-+ /**
-+ * A project aware class used for Javadoc extensions which take a name
-+ * and a path such as doclet and taglet arguments.
-+ *
-+ */
-+ public static class ExtensionInfo extends ProjectComponent {
-+ /** The name of the extension */
-+ private String name;
-+
-+ /** The optional path to use to load the extension */
-+ private Path path;
-+
-+ /**
-+ * Set the name of the extension
-+ *
-+ * @param name the extension's name.
-+ */
-+ public void setName(String name) {
-+ this.name = name;
-+ }
-+
-+ /**
-+ * Get the name of the extension.
-+ *
-+ * @return the extension's name.
-+ */
-+ public String getName() {
-+ return name;
-+ }
-+
-+ /**
-+ * Set the path to use when loading the component.
-+ *
-+ * @param path a Path instance containing the classpath to use.
-+ */
-+ public void setPath(Path path) {
-+ if (this.path == null) {
-+ this.path = path;
-+ } else {
-+ this.path.append(path);
-+ }
-+ }
-+
-+ /**
-+ * Get the extension's path.
-+ *
-+ * @return the path to be used to load the extension.
-+ * May be <code>null</code>
-+ */
-+ public Path getPath() {
-+ return path;
-+ }
-+
-+ /**
-+ * Create an empty nested path to be configured by Ant with the
-+ * classpath for the extension.
-+ *
-+ * @return a new Path instance to be configured.
-+ */
-+ public Path createPath() {
-+ if (path == null) {
-+ path = new Path(getProject());
-+ }
-+ return path.createPath();
-+ }
-+
-+ /**
-+ * Adds a reference to a CLASSPATH defined elsewhere.
-+ *
-+ * @param r the reference containing the path.
-+ */
-+ public void setPathRef(Reference r) {
-+ createPath().setRefid(r);
-+ }
-+ }
-+
-+ /**
-+ * This class stores info about doclets.
-+ *
-+ */
-+ public class DocletInfo extends ExtensionInfo {
-+
-+ /** Collection of doclet parameters. */
-+ private Vector params = new Vector();
-+
-+ /**
-+ * Create a doclet parameter to be configured by Ant.
-+ *
-+ * @return a new DocletParam instance to be configured.
-+ */
-+ public DocletParam createParam() {
-+ DocletParam param = new DocletParam();
-+ params.addElement(param);
-+
-+ return param;
-+ }
-+
-+ /**
-+ * Get the doclet's parameters.
-+ *
-+ * @return an Enumeration of DocletParam instances.
-+ */
-+ public Enumeration getParams() {
-+ return params.elements();
-+ }
-+ }
-+
-+ /**
-+ * Used to track info about the packages to be javadoc'd
-+ */
-+ public static class PackageName {
-+ /** The package name */
-+ private String name;
-+
-+ /**
-+ * Set the name of the package
-+ *
-+ * @param name the package name.
-+ */
-+ public void setName(String name) {
-+ this.name = name.trim();
-+ }
-+
-+ /**
-+ * Get the package name.
-+ *
-+ * @return the package's name.
-+ */
-+ public String getName() {
-+ return name;
-+ }
-+
-+ /**
-+ * @see java.lang.Object#toString
-+ */
-+ public String toString() {
-+ return getName();
-+ }
-+ }
-+
-+ /**
-+ * This class is used to manage the source files to be processed.
-+ */
-+ public static class SourceFile {
-+ /** The source file */
-+ private File file;
-+
-+ /**
-+ * Default constructor
-+ */
-+ public SourceFile() {
-+ }
-+
-+ /**
-+ * Constructor specifying the source file directly
-+ *
-+ * @param file the source file
-+ */
-+ public SourceFile(File file) {
-+ this.file = file;
-+ }
-+
-+ /**
-+ * Set the source file.
-+ *
-+ * @param file the source file.
-+ */
-+ public void setFile(File file) {
-+ this.file = file;
-+ }
-+
-+ /**
-+ * Get the source file.
-+ *
-+ * @return the source file.
-+ */
-+ public File getFile() {
-+ return file;
-+ }
-+ }
-+
-+ /**
-+ * An HTML element in the javadoc.
-+ *
-+ * This class is used for those javadoc elements which contain HTML such as
-+ * footers, headers, etc.
-+ */
-+ public static class Html {
-+ /** The text for the element */
-+ private StringBuffer text = new StringBuffer();
-+
-+ /**
-+ * Add text to the element.
-+ *
-+ * @param t the text to be added.
-+ */
-+ public void addText(String t) {
-+ text.append(t);
-+ }
-+
-+ /**
-+ * Get the current text for the element.
-+ *
-+ * @return the current text.
-+ */
-+ public String getText() {
-+ return text.substring(0);
-+ }
-+ }
-+
-+ /**
-+ * EnumeratedAttribute implementation supporting the javadoc scoping
-+ * values.
-+ */
-+ public static class AccessType extends EnumeratedAttribute {
-+ /**
-+ * @see EnumeratedAttribute#getValues().
-+ */
-+ public String[] getValues() {
-+ // Protected first so if any GUI tool offers a default
-+ // based on enum #0, it will be right.
-+ return new String[] {"protected", "public", "package", "private"};
-+ }
-+ }
-+
-+ /** The command line built to execute Javadoc. */
-+ private Commandline cmd = new Commandline();
-+
-+ /**
-+ * Utility method to add an argument to the command line conditionally
-+ * based on the given flag.
-+ *
-+ * @param b the flag which controls if the argument is added.
-+ * @param arg the argument value.
-+ */
-+ private void addArgIf(boolean b, String arg) {
-+ if (b) {
-+ cmd.createArgument().setValue(arg);
-+ }
-+ }
-+
-+ /**
-+ * Utility method to add a javadoc argument.
-+ *
-+ * @param key the argument name.
-+ * @param value the argument value.
-+ */
-+ private void addArgIfNotEmpty(String key, String value) {
-+ if (value != null && value.length() != 0) {
-+ cmd.createArgument().setValue(key);
-+ cmd.createArgument().setValue(value);
-+ } else {
-+ log("Warning: Leaving out empty argument '" + key + "'",
-+ Project.MSG_WARN);
-+ }
-+ }
-+
-+ /**
-+ * Flag which indicates if the task should fail if there is a
-+ * javadoc error.
-+ */
-+ private boolean failOnError = false;
-+ private Path sourcePath = null;
-+ private File destDir = null;
-+ private Vector sourceFiles = new Vector();
-+ private Vector packageNames = new Vector();
-+ private Vector excludePackageNames = new Vector(1);
-+ private boolean author = true;
-+ private boolean version = true;
-+ private DocletInfo doclet = null;
-+ private Path classpath = null;
-+ private Path bootclasspath = null;
-+ private String group = null;
-+ private String packageList = null;
-+ private Vector links = new Vector();
-+ private Vector groups = new Vector();
-+ private Vector tags = new Vector();
-+ private boolean useDefaultExcludes = true;
-+ private Html doctitle = null;
-+ private Html header = null;
-+ private Html footer = null;
-+ private Html bottom = null;
-+ private boolean useExternalFile = false;
-+ private FileUtils fileUtils = FileUtils.newFileUtils();
-+ private String source = null;
-+ private boolean linksource = false;
-+ private boolean breakiterator = false;
-+ private String noqualifier;
-+ private boolean includeNoSourcePackages = false;
-+ private boolean old = false;
-+ private String executable = null;
-+
-+ private Vector fileSets = new Vector();
-+ private Vector packageSets = new Vector();
-+
-+ /**
-+ * Work around command line length limit by using an external file
-+ * for the sourcefiles.
-+ *
-+ * @param b true if an external file is to be used.
-+ */
-+ public void setUseExternalFile(boolean b) {
-+ useExternalFile = b;
-+ }
-+
-+ /**
-+ * Sets whether default exclusions should be used or not.
-+ *
-+ * @param useDefaultExcludes "true"|"on"|"yes" when default exclusions
-+ * should be used, "false"|"off"|"no" when they
-+ * shouldn't be used.
-+ */
-+ public void setDefaultexcludes(boolean useDefaultExcludes) {
-+ this.useDefaultExcludes = useDefaultExcludes;
-+ }
-+
-+ /**
-+ * Set the maximum memory to be used by the javadoc process
-+ *
-+ * @param max a string indicating the maximum memory according to the
-+ * JVM conventions (e.g. 128m is 128 Megabytes)
-+ */
-+ public void setMaxmemory(String max) {
-+ cmd.createArgument().setValue("-J-Xmx" + max);
-+ }
-+
-+ /**
-+ * Set an additional parameter on the command line
-+ *
-+ * @param add the additional command line parameter for the javadoc task.
-+ */
-+ public void setAdditionalparam(String add) {
-+ cmd.createArgument().setLine(add);
-+ }
-+
-+ /**
-+ * Adds a command-line argument.
-+ * @since Ant 1.6
-+ */
-+ public Commandline.Argument createArg() {
-+ return cmd.createArgument();
-+ }
-+
-+ /**
-+ * Specify where to find source file
-+ *
-+ * @param src a Path instance containing the various source directories.
-+ */
-+ public void setSourcepath(Path src) {
-+ if (sourcePath == null) {
-+ sourcePath = src;
-+ } else {
-+ sourcePath.append(src);
-+ }
-+ }
-+
-+ /**
-+ * Create a path to be configured with the locations of the source
-+ * files.
-+ *
-+ * @return a new Path instance to be configured by the Ant core.
-+ */
-+ public Path createSourcepath() {
-+ if (sourcePath == null) {
-+ sourcePath = new Path(getProject());
-+ }
-+ return sourcePath.createPath();
-+ }
-+
-+ /**
-+ * Adds a reference to a CLASSPATH defined elsewhere.
-+ *
-+ * @param r the reference containing the source path definition.
-+ */
-+ public void setSourcepathRef(Reference r) {
-+ createSourcepath().setRefid(r);
-+ }
-+
-+ /**
-+ * Set the directory where the Javadoc output will be generated.
-+ *
-+ * @param dir the destination directory.
-+ */
-+ public void setDestdir(File dir) {
-+ destDir = dir;
-+ cmd.createArgument().setValue("-d");
-+ cmd.createArgument().setFile(destDir);
-+ }
-+
-+ /**
-+ * Set the list of source files to process.
-+ *
-+ * @param src a comma separated list of source files.
-+ */
-+ public void setSourcefiles(String src) {
-+ StringTokenizer tok = new StringTokenizer(src, ",");
-+ while (tok.hasMoreTokens()) {
-+ String f = tok.nextToken();
-+ SourceFile sf = new SourceFile();
-+ sf.setFile(getProject().resolveFile(f.trim()));
-+ addSource(sf);
-+ }
-+ }
-+
-+ /**
-+ * Add a single source file.
-+ *
-+ * @param sf the source file to be processed.
-+ */
-+ public void addSource(SourceFile sf) {
-+ sourceFiles.addElement(sf);
-+ }
-+
-+ /**
-+ * Set the package names to be processed.
-+ *
-+ * @param packages a comma separated list of packages specs
-+ * (may be wildcarded).
-+ *
-+ * @see #addPackage for wildcard information.
-+ */
-+ public void setPackagenames(String packages) {
-+ StringTokenizer tok = new StringTokenizer(packages, ",");
-+ while (tok.hasMoreTokens()) {
-+ String p = tok.nextToken();
-+ PackageName pn = new PackageName();
-+ pn.setName(p);
-+ addPackage(pn);
-+ }
-+ }
-+
-+ /**
-+ * Add a single package to be processed.
-+ *
-+ * If the package name ends with ".*" the Javadoc task
-+ * will find and process all subpackages.
-+ *
-+ * @param pn the package name, possibly wildcarded.
-+ */
-+ public void addPackage(PackageName pn) {
-+ packageNames.addElement(pn);
-+ }
-+
-+ /**
-+ * Set the list of packages to be excluded.
-+ *
-+ * @param packages a comma separated list of packages to be excluded.
-+ * This may not include wildcards.
-+ */
-+ public void setExcludePackageNames(String packages) {
-+ StringTokenizer tok = new StringTokenizer(packages, ",");
-+ while (tok.hasMoreTokens()) {
-+ String p = tok.nextToken();
-+ PackageName pn = new PackageName();
-+ pn.setName(p);
-+ addExcludePackage(pn);
-+ }
-+ }
-+
-+ /**
-+ * Add a package to be excluded from the javadoc run.
-+ *
-+ * @param pn the name of the package (wildcards are not permitted).
-+ */
-+ public void addExcludePackage(PackageName pn) {
-+ excludePackageNames.addElement(pn);
-+ }
-+
-+ /**
-+ * Specify the file containing the overview to be included in the generated
-+ * documentation.
-+ *
-+ * @param f the file containing the overview.
-+ */
-+ public void setOverview(File f) {
-+ cmd.createArgument().setValue("-overview");
-+ cmd.createArgument().setFile(f);
-+ }
-+
-+ /**
-+ * Indicate whether only public classes and members are to be included in
-+ * the scope processed
-+ *
-+ * @param b true if scope is to be public.
-+ */
-+ public void setPublic(boolean b) {
-+ addArgIf(b, "-public");
-+ }
-+
-+ /**
-+ * Indicate whether only protected and public classes and members are to
-+ * be included in the scope processed
-+ *
-+ * @param b true if scope is to be protected.
-+ */
-+ public void setProtected(boolean b) {
-+ addArgIf(b, "-protected");
-+ }
-+
-+ /**
-+ * Indicate whether only package, protected and public classes and
-+ * members are to be included in the scope processed
-+ *
-+ * @param b true if scope is to be package level.
-+ */
-+ public void setPackage(boolean b) {
-+ addArgIf(b, "-package");
-+ }
-+
-+ /**
-+ * Indicate whether all classes and
-+ * members are to be included in the scope processed
-+ *
-+ * @param b true if scope is to be private level.
-+ */
-+ public void setPrivate(boolean b) {
-+ addArgIf(b, "-private");
-+ }
-+
-+ /**
-+ * Set the scope to be processed. This is an alternative to the
-+ * use of the setPublic, setPrivate, etc methods. It gives better build
-+ * file control over what scope is processed.
-+ *
-+ * @param at the scope to be processed.
-+ */
-+ public void setAccess(AccessType at) {
-+ cmd.createArgument().setValue("-" + at.getValue());
-+ }
-+
-+ /**
-+ * Set the class that starts the doclet used in generating the
-+ * documentation.
-+ *
-+ * @param docletName the name of the doclet class.
-+ */
-+ public void setDoclet(String docletName) {
-+ if (doclet == null) {
-+ doclet = new DocletInfo();
-+ doclet.setProject(getProject());
-+ }
-+ doclet.setName(docletName);
-+ }
-+
-+ /**
-+ * Set the classpath used to find the doclet class.
-+ *
-+ * @param docletPath the doclet classpath.
-+ */
-+ public void setDocletPath(Path docletPath) {
-+ if (doclet == null) {
-+ doclet = new DocletInfo();
-+ doclet.setProject(getProject());
-+ }
-+ doclet.setPath(docletPath);
-+ }
-+
-+ /**
-+ * Set the classpath used to find the doclet class by reference.
-+ *
-+ * @param r the reference to the Path instance to use as the doclet
-+ * classpath.
-+ */
-+ public void setDocletPathRef(Reference r) {
-+ if (doclet == null) {
-+ doclet = new DocletInfo();
-+ doclet.setProject(getProject());
-+ }
-+ doclet.createPath().setRefid(r);
-+ }
-+
-+ /**
-+ * Create a doclet to be used in the documentation generation.
-+ *
-+ * @return a new DocletInfo instance to be configured.
-+ */
-+ public DocletInfo createDoclet() {
-+ doclet = new DocletInfo();
-+ return doclet;
-+ }
-+
-+ /**
-+ * Add a taglet
-+ *
-+ * @param tagletInfo information about the taglet.
-+ */
-+ public void addTaglet(ExtensionInfo tagletInfo) {
-+ tags.addElement(tagletInfo);
-+ }
-+
-+ /**
-+ * Indicate whether Javadoc should produce old style (JDK 1.1)
-+ * documentation.
-+ *
-+ * This is not supported by JDK 1.1 and has been phased out in JDK 1.4
-+ *
-+ * @param b if true attempt to generate old style documentation.
-+ */
-+ public void setOld(boolean b) {
-+ old = b;
-+ }
-+
-+ /**
-+ * Set the classpath to be used for this javadoc run.
-+ *
-+ * @param path an Ant Path object containing the compilation
-+ * classpath.
-+ */
-+ public void setClasspath(Path path) {
-+ if (classpath == null) {
-+ classpath = path;
-+ } else {
-+ classpath.append(path);
-+ }
-+ }
-+
-+ /**
-+ * Create a Path to be configured with the classpath to use
-+ *
-+ * @return a new Path instance to be configured with the classpath.
-+ */
-+ public Path createClasspath() {
-+ if (classpath == null) {
-+ classpath = new Path(getProject());
-+ }
-+ return classpath.createPath();
-+ }
-+
-+ /**
-+ * Adds a reference to a CLASSPATH defined elsewhere.
-+ *
-+ * @param r the reference to an instance defining the classpath.
-+ */
-+ public void setClasspathRef(Reference r) {
-+ createClasspath().setRefid(r);
-+ }
-+
-+ /**
-+ * Set the boot classpath to use.
-+ *
-+ * @param path the boot classpath.
-+ */
-+ public void setBootclasspath(Path path) {
-+ if (bootclasspath == null) {
-+ bootclasspath = path;
-+ } else {
-+ bootclasspath.append(path);
-+ }
-+ }
-+
-+ /**
-+ * Create a Path to be configured with the boot classpath
-+ *
-+ * @return a new Path instance to be configured with the boot classpath.
-+ */
-+ public Path createBootclasspath() {
-+ if (bootclasspath == null) {
-+ bootclasspath = new Path(getProject());
-+ }
-+ return bootclasspath.createPath();
-+ }
-+
-+ /**
-+ * Adds a reference to a CLASSPATH defined elsewhere.
-+ *
-+ * @param r the reference to an instance defining the bootclasspath.
-+ */
-+ public void setBootClasspathRef(Reference r) {
-+ createBootclasspath().setRefid(r);
-+ }
-+
-+ /**
-+ * Set the location of the extensions directories.
-+ *
-+ * @param path the string version of the path.
-+ * @deprecated Use the {@link #setExtdirs(Path)} version.
-+ */
-+ public void setExtdirs(String path) {
-+ cmd.createArgument().setValue("-extdirs");
-+ cmd.createArgument().setValue(path);
-+ }
-+
-+ /**
-+ * Set the location of the extensions directories.
-+ *
-+ * @param path a path containing the extension directories.
-+ */
-+ public void setExtdirs(Path path) {
-+ cmd.createArgument().setValue("-extdirs");
-+ cmd.createArgument().setPath(path);
-+ }
-+
-+ /**
-+ * Run javadoc in verbose mode
-+ *
-+ * @param b true if operation is to be verbose.
-+ */
-+ public void setVerbose(boolean b) {
-+ addArgIf(b, "-verbose");
-+ }
-+
-+ /**
-+ * Set the local to use in documentation generation.
-+ *
-+ * @param locale the locale to use.
-+ */
-+ public void setLocale(String locale) {
-+ // createArgument(true) is necessary to make sure, -locale
-+ // is the first argument (required in 1.3+).
-+ cmd.createArgument(true).setValue(locale);
-+ cmd.createArgument(true).setValue("-locale");
-+ }
-+
-+ /**
-+ * Set the encoding name of the source files,
-+ *
-+ * @param enc the name of the encoding for the source files.
-+ */
-+ public void setEncoding(String enc) {
-+ cmd.createArgument().setValue("-encoding");
-+ cmd.createArgument().setValue(enc);
-+ }
-+
-+ /**
-+ * Include the version tag in the generated documentation.
-+ *
-+ * @param b true if the version tag should be included.
-+ */
-+ public void setVersion(boolean b) {
-+ this.version = b;
-+ }
-+
-+ /**
-+ * Generate the "use" page for each package.
-+ *
-+ * @param b true if the use page should be generated.
-+ */
-+ public void setUse(boolean b) {
-+ addArgIf(b, "-use");
-+ }
-+
-+
-+ /**
-+ * Include the author tag in the generated documentation.
-+ *
-+ * @param b true if the author tag should be included.
-+ */
-+ public void setAuthor(boolean b) {
-+ author = b;
-+ }
-+
-+ /**
-+ * Generate a split index
-+ *
-+ * @param b true if the index should be split into a file per letter.
-+ */
-+ public void setSplitindex(boolean b) {
-+ addArgIf(b, "-splitindex");
-+ }
-+
-+ /**
-+ * Set the title to be placed in the HTML <title> tag of the
-+ * generated documentation.
-+ *
-+ * @param title the window title to use.
-+ */
-+ public void setWindowtitle(String title) {
-+ addArgIfNotEmpty("-windowtitle", title);
-+ }
-+
-+ /**
-+ * Set the title of the generated overview page.
-+ *
-+ * @param doctitle the Document title.
-+ */
-+ public void setDoctitle(String doctitle) {
-+ Html h = new Html();
-+ h.addText(doctitle);
-+ addDoctitle(h);
-+ }
-+
-+ /**
-+ * Add a document title to use for the overview page.
-+ *
-+ * @param text the HTML element containing the document title.
-+ */
-+ public void addDoctitle(Html text) {
-+ doctitle = text;
-+ }
-+
-+ /**
-+ * Set the header text to be placed at the top of each output file.
-+ *
-+ * @param header the header text
-+ */
-+ public void setHeader(String header) {
-+ Html h = new Html();
-+ h.addText(header);
-+ addHeader(h);
-+ }
-+
-+ /**
-+ * Set the header text to be placed at the top of each output file.
-+ *
-+ * @param text the header text
-+ */
-+ public void addHeader(Html text) {
-+ header = text;
-+ }
-+
-+ /**
-+ * Set the footer text to be placed at the bottom of each output file.
-+ *
-+ * @param footer the footer text.
-+ */
-+ public void setFooter(String footer) {
-+ Html h = new Html();
-+ h.addText(footer);
-+ addFooter(h);
-+ }
-+
-+ /**
-+ * Set the footer text to be placed at the bottom of each output file.
-+ *
-+ * @param text the footer text.
-+ */
-+ public void addFooter(Html text) {
-+ footer = text;
-+ }
-+
-+ /**
-+ * Set the text to be placed at the bottom of each output file.
-+ *
-+ * @param bottom the bottom text.
-+ */
-+ public void setBottom(String bottom) {
-+ Html h = new Html();
-+ h.addText(bottom);
-+ addBottom(h);
-+ }
-+
-+ /**
-+ * Set the text to be placed at the bottom of each output file.
-+ *
-+ * @param text the bottom text.
-+ */
-+ public void addBottom(Html text) {
-+ bottom = text;
-+ }
-+
-+ /**
-+ * Link to docs at "url" using package list at "url2"
-+ * - separate the URLs by using a space character.
-+ *
-+ * @param src the offline link specification (url and package list)
-+ */
-+ public void setLinkoffline(String src) {
-+ if (/*1.2+*/true) {
-+ LinkArgument le = createLink();
-+ le.setOffline(true);
-+ String linkOfflineError = "The linkoffline attribute must include"
-+ + " a URL and a package-list file location separated by a"
-+ + " space";
-+ if (src.trim().length() == 0) {
-+ throw new BuildException(linkOfflineError);
-+ }
-+ StringTokenizer tok = new StringTokenizer(src, " ", false);
-+ le.setHref(tok.nextToken());
-+
-+ if (!tok.hasMoreTokens()) {
-+ throw new BuildException(linkOfflineError);
-+ }
-+ le.setPackagelistLoc(getProject().resolveFile(tok.nextToken()));
-+ }
-+ }
-+
-+ /**
-+ * Group specified packages together in overview page.
-+ *
-+ * @param src the group packages - a command separated list of group specs,
-+ * each one being a group name and package specification separated
-+ * by a space.
-+ */
-+ public void setGroup(String src) {
-+ group = src;
-+ }
-+
-+ /**
-+ * Create links to javadoc output at the given URL.
-+ */
-+ public void setLink(String src) {
-+ createLink().setHref(src);
-+ }
-+
-+ /**
-+ * Control deprecation infromation
-+ *
-+ * @param b If true, do not include deprecated information.
-+ */
-+ public void setNodeprecated(boolean b) {
-+ addArgIf(b, "-nodeprecated");
-+ }
-+
-+ /**
-+ * Control deprecated list generation
-+ *
-+ * @param b if true, do not generate deprecated list.
-+ */
-+ public void setNodeprecatedlist(boolean b) {
-+ addArgIf(b, "-nodeprecatedlist");
-+ }
-+
-+ /**
-+ * Control class tree generation.
-+ *
-+ * @param b if true, do not generate class hierarchy.
-+ */
-+ public void setNotree(boolean b) {
-+ addArgIf(b, "-notree");
-+ }
-+
-+ /**
-+ * Control generation of index.
-+ *
-+ * @param b if true, do not generate index.
-+ */
-+ public void setNoindex(boolean b) {
-+ addArgIf(b, "-noindex");
-+ }
-+
-+ /**
-+ * Control generation of help link.
-+ *
-+ * @param b if true, do not generate help link
-+ */
-+ public void setNohelp(boolean b) {
-+ addArgIf(b, "-nohelp");
-+ }
-+
-+ /**
-+ * Control generation of the navigation bar.
-+ *
-+ * @param b if true, do not generate navigation bar.
-+ */
-+ public void setNonavbar(boolean b) {
-+ addArgIf(b, "-nonavbar");
-+ }
-+
-+ /**
-+ * Control warnings about serial tag.
-+ *
-+ * @param b if true, generate warning about the serial tag.
-+ */
-+ public void setSerialwarn(boolean b) {
-+ addArgIf(b, "-serialwarn");
-+ }
-+
-+ /**
-+ * Specifies the CSS stylesheet file to use.
-+ *
-+ * @param f the file with the CSS to use.
-+ */
-+ public void setStylesheetfile(File f) {
-+ cmd.createArgument().setValue("-stylesheetfile");
-+ cmd.createArgument().setFile(f);
-+ }
-+
-+ /**
-+ * Specifies the HTML help file to use.
-+ *
-+ * @param f the file containing help content.
-+ */
-+ public void setHelpfile(File f) {
-+ cmd.createArgument().setValue("-helpfile");
-+ cmd.createArgument().setFile(f);
-+ }
-+
-+ /**
-+ * Output file encoding name.
-+ *
-+ * @param enc name of the encoding to use.
-+ */
-+ public void setDocencoding(String enc) {
-+ cmd.createArgument().setValue("-docencoding");
-+ cmd.createArgument().setValue(enc);
-+ }
-+
-+ /**
-+ * The name of a file containing the packages to process.
-+ *
-+ * @param src the file containing the package list.
-+ */
-+ public void setPackageList(String src) {
-+ packageList = src;
-+ }
-+
-+ /**
-+ * Create link to javadoc output at the given URL.
-+ *
-+ * @return link argument to configure
-+ */
-+ public LinkArgument createLink() {
-+ LinkArgument la = new LinkArgument();
-+ links.addElement(la);
-+ return la;
-+ }
-+
-+ /**
-+ * Represents a link triplet (href, whether link is offline, location of the
-+ * package list if off line)
-+ */
-+ public class LinkArgument {
-+ private String href;
-+ private boolean offline = false;
-+ private File packagelistLoc;
-+ private boolean resolveLink = false;
-+
-+ public LinkArgument() {
-+ }
-+
-+ public void setHref(String hr) {
-+ href = hr;
-+ }
-+
-+ public String getHref() {
-+ return href;
-+ }
-+
-+ public void setPackagelistLoc(File src) {
-+ packagelistLoc = src;
-+ }
-+
-+ public File getPackagelistLoc() {
-+ return packagelistLoc;
-+ }
-+
-+ public void setOffline(boolean offline) {
-+ this.offline = offline;
-+ }
-+
-+ public boolean isLinkOffline() {
-+ return offline;
-+ }
-+
-+ /**
-+ * Sets whether Ant should resolve the link attribute relative
-+ * to the current basedir.
-+ * @param resolve a <code>boolean</code> value
-+ */
-+ public void setResolveLink(boolean resolve) {
-+ this.resolveLink = resolve;
-+ }
-+
-+ /**
-+ * should Ant resolve the link attribute relative to the
-+ * current basedir?
-+ */
-+ public boolean shouldResolveLink() {
-+ return resolveLink;
-+ }
-+
-+ }
-+
-+ /**
-+ * Creates and adds a -tag argument. This is used to specify
-+ * custom tags. This argument is only available for JavaDoc 1.4,
-+ * and will generate a verbose message (and then be ignored)
-+ * when run on Java versions below 1.4.
-+ */
-+ public TagArgument createTag() {
-+ TagArgument ta = new TagArgument();
-+ tags.addElement (ta);
-+ return ta;
-+ }
-+
-+ /**
-+ * Scope element verbose names. (Defined here as fields
-+ * cannot be static in inner classes.) The first letter
-+ * from each element is used to build up the scope string.
-+ */
-+ static final String[] SCOPE_ELEMENTS = {
-+ "overview", "packages", "types", "constructors",
-+ "methods", "fields"
-+ };
-+
-+ /**
-+ * Class representing a -tag argument.
-+ */
-+ public class TagArgument extends FileSet {
-+ /** Name of the tag. */
-+ private String name = null;
-+ /** Description of the tag to place in the JavaDocs. */
-+ private String description = null;
-+ /** Whether or not the tag is enabled. */
-+ private boolean enabled = true;
-+ /**
-+ * Scope string of the tag. This will form the middle
-+ * argument of the -tag parameter when the tag is enabled
-+ * (with an X prepended for and is parsed from human-readable form.
-+ */
-+ private String scope = "a";
-+
-+ /** Sole constructor. */
-+ public TagArgument () {
-+ }
-+
-+ /**
-+ * Sets the name of the tag.
-+ *
-+ * @param name The name of the tag.
-+ * Must not be <code>null</code> or empty.
-+ */
-+ public void setName (String name) {
-+ this.name = name;
-+ }
-+
-+ /**
-+ * Sets the description of the tag. This is what appears in
-+ * the JavaDoc.
-+ *
-+ * @param description The description of the tag.
-+ * Must not be <code>null</code> or empty.
-+ */
-+ public void setDescription (String description) {
-+ this.description = description;
-+ }
-+
-+ /**
-+ * Sets the scope of the tag. This is in comma-separated
-+ * form, with each element being one of "all" (the default),
-+ * "overview", "packages", "types", "constructors", "methods",
-+ * "fields". The elements are treated in a case-insensitive
-+ * manner.
-+ *
-+ * @param verboseScope The scope of the tag.
-+ * Must not be <code>null</code>,
-+ * should not be empty.
-+ *
-+ * @exception BuildException if all is specified along with
-+ * other elements, if any elements are repeated, if no
-+ * elements are specified, or if any unrecognised elements are
-+ * specified.
-+ */
-+ public void setScope (String verboseScope) throws BuildException {
-+ verboseScope = verboseScope.toLowerCase(Locale.US);
-+
-+ boolean[] elements = new boolean[SCOPE_ELEMENTS.length];
-+
-+ boolean gotAll = false;
-+ boolean gotNotAll = false;
-+
-+ // Go through the tokens one at a time, updating the
-+ // elements array and issuing warnings where appropriate.
-+ StringTokenizer tok = new StringTokenizer (verboseScope, ",");
-+ while (tok.hasMoreTokens()) {
-+ String next = tok.nextToken().trim();
-+ if (next.equals("all")) {
-+ if (gotAll) {
-+ getProject().log ("Repeated tag scope element: all",
-+ Project.MSG_VERBOSE);
-+ }
-+ gotAll = true;
-+ } else {
-+ int i;
-+ for (i = 0; i < SCOPE_ELEMENTS.length; i++) {
-+ if (next.equals (SCOPE_ELEMENTS[i])) {
-+ break;
-+ }
-+ }
-+ if (i == SCOPE_ELEMENTS.length) {
-+ throw new BuildException ("Unrecognised scope element: "
-+ + next);
-+ } else {
-+ if (elements[i]) {
-+ getProject().log ("Repeated tag scope element: "
-+ + next, Project.MSG_VERBOSE);
-+ }
-+ elements[i] = true;
-+ gotNotAll = true;
-+ }
-+ }
-+ }
-+
-+ if (gotNotAll && gotAll) {
-+ throw new BuildException ("Mixture of \"all\" and other scope "
-+ + "elements in tag parameter.");
-+ }
-+ if (!gotNotAll && !gotAll) {
-+ throw new BuildException ("No scope elements specified in tag "
-+ + "parameter.");
-+ }
-+ if (gotAll) {
-+ this.scope = "a";
-+ } else {
-+ StringBuffer buff = new StringBuffer (elements.length);
-+ for (int i = 0; i < elements.length; i++) {
-+ if (elements[i]) {
-+ buff.append (SCOPE_ELEMENTS[i].charAt(0));
-+ }
-+ }
-+ this.scope = buff.toString();
-+ }
-+ }
-+
-+ /**
-+ * Sets whether or not the tag is enabled.
-+ *
-+ * @param enabled Whether or not this tag is enabled.
-+ */
-+ public void setEnabled (boolean enabled) {
-+ this.enabled = enabled;
-+ }
-+
-+ /**
-+ * Returns the -tag parameter this argument represented.
-+ *
-+ * @exception BuildException if either the name or description
-+ * is <code>null</code> or empty.
-+ */
-+ public String getParameter () throws BuildException {
-+ if (name == null || name.equals("")) {
-+ throw new BuildException ("No name specified for custom tag.");
-+ }
-+ if (description != null) {
-+ return name + ":" + (enabled ? "" : "X")
-+ + scope + ":" + description;
-+ } else {
-+ return name;
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Separates packages on the overview page into whatever
-+ * groups you specify, one group per table.
-+ */
-+ public GroupArgument createGroup() {
-+ GroupArgument ga = new GroupArgument();
-+ groups.addElement(ga);
-+ return ga;
-+ }
-+
-+ public class GroupArgument {
-+ private Html title;
-+ private Vector packages = new Vector();
-+
-+ public GroupArgument() {
-+ }
-+
-+ public void setTitle(String src) {
-+ Html h = new Html();
-+ h.addText(src);
-+ addTitle(h);
-+ }
-+ public void addTitle(Html text) {
-+ title = text;
-+ }
-+
-+ public String getTitle() {
-+ return title != null ? title.getText() : null;
-+ }
-+
-+ public void setPackages(String src) {
-+ StringTokenizer tok = new StringTokenizer(src, ",");
-+ while (tok.hasMoreTokens()) {
-+ String p = tok.nextToken();
-+ PackageName pn = new PackageName();
-+ pn.setName(p);
-+ addPackage(pn);
-+ }
-+ }
-+ public void addPackage(PackageName pn) {
-+ packages.addElement(pn);
-+ }
-+
-+ public String getPackages() {
-+ StringBuffer p = new StringBuffer();
-+ for (int i = 0; i < packages.size(); i++) {
-+ if (i > 0) {
-+ p.append(":");
-+ }
-+ p.append(packages.elementAt(i).toString());
-+ }
-+ return p.toString();
-+ }
-+ }
-+
-+ /**
-+ * Charset for cross-platform viewing of generated documentation.
-+ */
-+ public void setCharset(String src) {
-+ this.addArgIfNotEmpty("-charset", src);
-+ }
-+
-+ /**
-+ * Should the build process fail if javadoc fails (as indicated by
-+ * a non zero return code)?
-+ *
-+ * <p>Default is false.</p>
-+ */
-+ public void setFailonerror(boolean b) {
-+ failOnError = b;
-+ }
-+
-+ /**
-+ * Enables the -source switch, will be ignored if javadoc is not
-+ * the 1.4 version.
-+ *
-+ * @since Ant 1.5
-+ */
-+ public void setSource(String source) {
-+ this.source = source;
-+ }
-+
-+ /**
-+ * Sets the actual executable command to invoke, instead of the binary
-+ * <code>javadoc</code> found in Ant's JDK.
-+ * @since Ant 1.6.3
-+ */
-+ public void setExecutable(String executable) {
-+ this.executable = executable;
-+ }
-+
-+ /**
-+ * Adds a packageset.
-+ *
-+ * <p>All included directories will be translated into package
-+ * names be converting the directory separator into dots.</p>
-+ *
-+ * @since 1.5
-+ */
-+ public void addPackageset(DirSet packageSet) {
-+ packageSets.addElement(packageSet);
-+ }
-+
-+ /**
-+ * Adds a fileset.
-+ *
-+ * <p>All included files will be added as sourcefiles. The task
-+ * will automatically add
-+ * <code>includes="**/*.java"</code> to the
-+ * fileset.</p>
-+ *
-+ * @since 1.5
-+ */
-+ public void addFileset(FileSet fs) {
-+ fileSets.addElement(fs);
-+ }
-+
-+ /**
-+ * Enables the -linksource switch, will be ignored if javadoc is not
-+ * the 1.4 version. Default is false
-+ *
-+ * @since Ant 1.6
-+ */
-+ public void setLinksource(boolean b) {
-+ this.linksource = b;
-+ }
-+
-+ /**
-+ * Enables the -linksource switch, will be ignored if javadoc is not
-+ * the 1.4 version. Default is false
-+ *
-+ * @since Ant 1.6
-+ */
-+ public void setBreakiterator(boolean b) {
-+ this.breakiterator = b;
-+ }
-+
-+ /**
-+ * Enables the -noqualifier switch, will be ignored if javadoc is not
-+ * the 1.4 version.
-+ *
-+ * @since Ant 1.6
-+ */
-+ public void setNoqualifier(String noqualifier) {
-+ this.noqualifier = noqualifier;
-+ }
-+
-+ /**
-+ * If set to true, Ant will also accept packages that only hold
-+ * package.html files but no Java sources.
-+ * @since Ant 1.6.3
-+ */
-+ public void setIncludeNoSourcePackages(boolean b) {
-+ this.includeNoSourcePackages = b;
-+ }
-+
-+ public void execute() throws BuildException {
-+
-+ // Whether *this VM* is 1.4+ (but also check executable != null).
-+ boolean javadoc4 =
-+ !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) &&
-+ !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3);
-+
-+ Vector packagesToDoc = new Vector();
-+ Path sourceDirs = new Path(getProject());
-+
-+ if (packageList != null && sourcePath == null) {
-+ String msg = "sourcePath attribute must be set when "
-+ + "specifying packagelist.";
-+ throw new BuildException(msg);
-+ }
-+
-+ if (sourcePath != null) {
-+ sourceDirs.addExisting(sourcePath);
-+ }
-+
-+ parsePackages(packagesToDoc, sourceDirs);
-+
-+ if (packagesToDoc.size() != 0 && sourceDirs.size() == 0) {
-+ String msg = "sourcePath attribute must be set when "
-+ + "specifying package names.";
-+ throw new BuildException(msg);
-+ }
-+
-+ Vector sourceFilesToDoc = (Vector) sourceFiles.clone();
-+ addFileSets(sourceFilesToDoc);
-+
-+ if (packageList == null && packagesToDoc.size() == 0
-+ && sourceFilesToDoc.size() == 0) {
-+ throw new BuildException("No source files and no packages have "
-+ + "been specified.");
-+ }
-+
-+ log("Generating Javadoc with Gjdoc", Project.MSG_INFO);
-+
-+ Commandline toExecute = (Commandline) cmd.clone();
-+
-+ if (executable != null)
-+ toExecute.setExecutable(executable);
-+ else
-+ toExecute.setExecutable("/usr/bin/gjdoc");
-+
-+
-+ // ------------------------------------------ general javadoc arguments
-+ if (doctitle != null) {
-+ toExecute.createArgument().setValue("-doctitle");
-+ toExecute.createArgument().setValue(expand(doctitle.getText()));
-+ }
-+ if (header != null) {
-+ toExecute.createArgument().setValue("-header");
-+ toExecute.createArgument().setValue(expand(header.getText()));
-+ }
-+ if (footer != null) {
-+ toExecute.createArgument().setValue("-footer");
-+ toExecute.createArgument().setValue(expand(footer.getText()));
-+ }
-+ if (bottom != null) {
-+ toExecute.createArgument().setValue("-bottom");
-+ toExecute.createArgument().setValue(expand(bottom.getText()));
-+ }
-+
-+ if (classpath == null) {
-+ classpath = (new Path(getProject())).concatSystemClasspath("last");
-+ } else {
-+ classpath = classpath.concatSystemClasspath("ignore");
-+ }
-+
-+ if (/*1.2+*/true) {
-+ if (classpath.size() > 0) {
-+ toExecute.createArgument().setValue("-classpath");
-+ toExecute.createArgument().setPath(classpath);
-+ }
-+ if (sourceDirs.size() > 0) {
-+ toExecute.createArgument().setValue("-sourcepath");
-+ toExecute.createArgument().setPath(sourceDirs);
-+ }
-+ }
-+
-+ if (version && doclet == null) {
-+ toExecute.createArgument().setValue("-version");
-+ }
-+ if (author && doclet == null) {
-+ toExecute.createArgument().setValue("-author");
-+ }
-+
-+ if (doclet == null) {
-+ if (destDir == null) {
-+ String msg = "destDir attribute must be set!";
-+ throw new BuildException(msg);
-+ }
-+ }
-+
-+ // ---------------------------- javadoc2 arguments for default doclet
-+
-+ if (/*1.2+*/true) {
-+ if (doclet != null) {
-+ if (doclet.getName() == null) {
-+ throw new BuildException("The doclet name must be "
-+ + "specified.", getLocation());
-+ } else {
-+ toExecute.createArgument().setValue("-doclet");
-+ toExecute.createArgument().setValue(doclet.getName());
-+ if (doclet.getPath() != null) {
-+ Path docletPath
-+ = doclet.getPath().concatSystemClasspath("ignore");
-+ if (docletPath.size() != 0) {
-+ toExecute.createArgument().setValue("-docletpath");
-+ toExecute.createArgument().setPath(docletPath);
-+ }
-+ }
-+ for (Enumeration e = doclet.getParams();
-+ e.hasMoreElements();) {
-+ DocletParam param = (DocletParam) e.nextElement();
-+ if (param.getName() == null) {
-+ throw new BuildException("Doclet parameters must "
-+ + "have a name");
-+ }
-+
-+ toExecute.createArgument().setValue(param.getName());
-+ if (param.getValue() != null) {
-+ toExecute.createArgument()
-+ .setValue(param.getValue());
-+ }
-+ }
-+ }
-+ }
-+ if (bootclasspath != null && bootclasspath.size() > 0) {
-+ toExecute.createArgument().setValue("-bootclasspath");
-+ toExecute.createArgument().setPath(bootclasspath);
-+ }
-+
-+ // add the links arguments
-+ if (links.size() != 0) {
-+ for (Enumeration e = links.elements(); e.hasMoreElements();) {
-+ LinkArgument la = (LinkArgument) e.nextElement();
-+
-+ if (la.getHref() == null || la.getHref().length() == 0) {
-+ log("No href was given for the link - skipping",
-+ Project.MSG_VERBOSE);
-+ continue;
-+ }
-+ String link = null;
-+ if (la.shouldResolveLink()) {
-+ File hrefAsFile =
-+ getProject().resolveFile(la.getHref());
-+ if (hrefAsFile.exists()) {
-+ try {
-+ link = fileUtils.getFileURL(hrefAsFile)
-+ .toExternalForm();
-+ } catch (MalformedURLException ex) {
-+ // should be impossible
-+ log("Warning: link location was invalid "
-+ + hrefAsFile, Project.MSG_WARN);
-+ }
-+ }
-+ }
-+ if (link == null) {
-+ // is the href a valid URL
-+ try {
-+ URL base = new URL("file://.");
-+ new URL(base, la.getHref());
-+ link = la.getHref();
-+ } catch (MalformedURLException mue) {
-+ // ok - just skip
-+ log("Link href \"" + la.getHref()
-+ + "\" is not a valid url - skipping link",
-+ Project.MSG_WARN);
-+ continue;
-+ }
-+ }
-+
-+ if (la.isLinkOffline()) {
-+ File packageListLocation = la.getPackagelistLoc();
-+ if (packageListLocation == null) {
-+ throw new BuildException("The package list "
-+ + " location for link " + la.getHref()
-+ + " must be provided because the link is "
-+ + "offline");
-+ }
-+ File packageListFile =
-+ new File(packageListLocation, "package-list");
-+ if (packageListFile.exists()) {
-+ try {
-+ String packageListURL =
-+ fileUtils.getFileURL(packageListLocation)
-+ .toExternalForm();
-+ toExecute.createArgument()
-+ .setValue("-linkoffline");
-+ toExecute.createArgument()
-+ .setValue(link);
-+ toExecute.createArgument()
-+ .setValue(packageListURL);
-+ } catch (MalformedURLException ex) {
-+ log("Warning: Package list location was "
-+ + "invalid " + packageListLocation,
-+ Project.MSG_WARN);
-+ }
-+ } else {
-+ log("Warning: No package list was found at "
-+ + packageListLocation, Project.MSG_VERBOSE);
-+ }
-+ } else {
-+ toExecute.createArgument().setValue("-link");
-+ toExecute.createArgument().setValue(link);
-+ }
-+ }
-+ }
-+
-+ // add the single group arguments
-+ // Javadoc 1.2 rules:
-+ // Multiple -group args allowed.
-+ // Each arg includes 3 strings: -group [name] [packagelist].
-+ // Elements in [packagelist] are colon-delimited.
-+ // An element in [packagelist] may end with the * wildcard.
-+
-+ // Ant javadoc task rules for group attribute:
-+ // Args are comma-delimited.
-+ // Each arg is 2 space-delimited strings.
-+ // E.g., group="XSLT_Packages org.apache.xalan.xslt*,
-+ // XPath_Packages org.apache.xalan.xpath*"
-+ if (group != null) {
-+ StringTokenizer tok = new StringTokenizer(group, ",", false);
-+ while (tok.hasMoreTokens()) {
-+ String grp = tok.nextToken().trim();
-+ int space = grp.indexOf(" ");
-+ if (space > 0) {
-+ String name = grp.substring(0, space);
-+ String pkgList = grp.substring(space + 1);
-+ toExecute.createArgument().setValue("-group");
-+ toExecute.createArgument().setValue(name);
-+ toExecute.createArgument().setValue(pkgList);
-+ }
-+ }
-+ }
-+
-+ // add the group arguments
-+ if (groups.size() != 0) {
-+ for (Enumeration e = groups.elements(); e.hasMoreElements();) {
-+ GroupArgument ga = (GroupArgument) e.nextElement();
-+ String title = ga.getTitle();
-+ String packages = ga.getPackages();
-+ if (title == null || packages == null) {
-+ throw new BuildException("The title and packages must "
-+ + "be specified for group "
-+ + "elements.");
-+ }
-+ toExecute.createArgument().setValue("-group");
-+ toExecute.createArgument().setValue(expand(title));
-+ toExecute.createArgument().setValue(packages);
-+ }
-+ }
-+
-+ // JavaDoc 1.4 parameters
-+ if (javadoc4 || executable != null) {
-+ for (Enumeration e = tags.elements(); e.hasMoreElements();) {
-+ Object element = e.nextElement();
-+ if (element instanceof TagArgument) {
-+ TagArgument ta = (TagArgument) element;
-+ File tagDir = ta.getDir(getProject());
-+ if (tagDir == null) {
-+ // The tag element is not used as a fileset,
-+ // but specifies the tag directly.
-+ toExecute.createArgument().setValue ("-tag");
-+ toExecute.createArgument().setValue (ta.getParameter());
-+ } else {
-+ // The tag element is used as a fileset. Parse all the files and
-+ // create -tag arguments.
-+ DirectoryScanner tagDefScanner = ta.getDirectoryScanner(getProject());
-+ String[] files = tagDefScanner.getIncludedFiles();
-+ for (int i = 0; i < files.length; i++) {
-+ File tagDefFile = new File(tagDir, files[i]);
-+ try {
-+ BufferedReader in
-+ = new BufferedReader(new FileReader(tagDefFile));
-+ String line = null;
-+ while ((line = in.readLine()) != null) {
-+ toExecute.createArgument().setValue ("-tag");
-+ toExecute.createArgument().setValue (line);
-+ }
-+ in.close();
-+ } catch (IOException ioe) {
-+ throw new BuildException("Couldn't read "
-+ + " tag file from "
-+ + tagDefFile.getAbsolutePath(), ioe);
-+ }
-+ }
-+ }
-+ } else {
-+ ExtensionInfo tagletInfo = (ExtensionInfo) element;
-+ toExecute.createArgument().setValue("-taglet");
-+ toExecute.createArgument().setValue(tagletInfo
-+ .getName());
-+ if (tagletInfo.getPath() != null) {
-+ Path tagletPath = tagletInfo.getPath()
-+ .concatSystemClasspath("ignore");
-+ if (tagletPath.size() != 0) {
-+ toExecute.createArgument()
-+ .setValue("-tagletpath");
-+ toExecute.createArgument().setPath(tagletPath);
-+ }
-+ }
-+ }
-+ }
-+
-+ if (source != null) {
-+ toExecute.createArgument().setValue("-source");
-+ toExecute.createArgument().setValue(source);
-+ }
-+
-+ if (linksource && doclet == null) {
-+ toExecute.createArgument().setValue("-linksource");
-+ }
-+ if (breakiterator && doclet == null) {
-+ toExecute.createArgument().setValue("-breakiterator");
-+ }
-+ if (noqualifier != null && doclet == null) {
-+ toExecute.createArgument().setValue("-noqualifier");
-+ toExecute.createArgument().setValue(noqualifier);
-+ }
-+ } else {
-+ // Not 1.4+.
-+ if (!tags.isEmpty()) {
-+ log("-tag and -taglet options not supported on Javadoc < 1.4",
-+ Project.MSG_VERBOSE);
-+ }
-+ if (source != null) {
-+ log("-source option not supported on JavaDoc < 1.4",
-+ Project.MSG_VERBOSE);
-+ }
-+ if (linksource) {
-+ log("-linksource option not supported on JavaDoc < 1.4",
-+ Project.MSG_VERBOSE);
-+ }
-+ if (breakiterator) {
-+ log("-breakiterator option not supported on JavaDoc < 1.4",
-+ Project.MSG_VERBOSE);
-+ }
-+ if (noqualifier != null) {
-+ log("-noqualifier option not supported on JavaDoc < 1.4",
-+ Project.MSG_VERBOSE);
-+ }
-+ }
-+ // Javadoc 1.2/1.3 parameters:
-+ if (!javadoc4 || executable != null) {
-+ if (old) {
-+ toExecute.createArgument().setValue("-1.1");
-+ }
-+ } else {
-+ if (old) {
-+ log("Javadoc 1.4 doesn't support the -1.1 switch anymore",
-+ Project.MSG_WARN);
-+ }
-+ }
-+
-+ }
-+
-+ File tmpList = null;
-+ PrintWriter srcListWriter = null;
-+ try {
-+
-+ /**
-+ * Write sourcefiles and package names to a temporary file
-+ * if requested.
-+ */
-+ if (useExternalFile) {
-+ if (tmpList == null) {
-+ tmpList = fileUtils.createTempFile("javadoc", "", null);
-+ tmpList.deleteOnExit();
-+ toExecute.createArgument()
-+ .setValue("@" + tmpList.getAbsolutePath());
-+ }
-+ srcListWriter = new PrintWriter(
-+ new FileWriter(tmpList.getAbsolutePath(),
-+ true));
-+ }
-+
-+ Enumeration e = packagesToDoc.elements();
-+ while (e.hasMoreElements()) {
-+ String packageName = (String) e.nextElement();
-+ if (useExternalFile) {
-+ srcListWriter.println(packageName);
-+ } else {
-+ toExecute.createArgument().setValue(packageName);
-+ }
-+ }
-+
-+ e = sourceFilesToDoc.elements();
-+ while (e.hasMoreElements()) {
-+ SourceFile sf = (SourceFile) e.nextElement();
-+ String sourceFileName = sf.getFile().getAbsolutePath();
-+ if (useExternalFile) {
-+ if (javadoc4 && sourceFileName.indexOf(" ") > -1) {
-+ srcListWriter.println("\"" + sourceFileName + "\"");
-+ } else {
-+ srcListWriter.println(sourceFileName);
-+ }
-+ } else {
-+ toExecute.createArgument().setValue(sourceFileName);
-+ }
-+ }
-+
-+ } catch (IOException e) {
-+ tmpList.delete();
-+ throw new BuildException("Error creating temporary file",
-+ e, getLocation());
-+ } finally {
-+ if (srcListWriter != null) {
-+ srcListWriter.close();
-+ }
-+ }
-+
-+ if (packageList != null) {
-+ toExecute.createArgument().setValue("@" + packageList);
-+ }
-+ log(toExecute.describeCommand(), Project.MSG_VERBOSE);
-+
-+ log("Javadoc execution through Gjdoc", Project.MSG_INFO);
-+
-+ JavadocOutputStream out = new JavadocOutputStream(Project.MSG_INFO);
-+ JavadocOutputStream err = new JavadocOutputStream(Project.MSG_WARN);
-+
-+ Execute exe = new Execute(new PumpStreamHandler(out, err));
-+ exe.setAntRun(getProject());
-+
-+ String[] env = exe.getEnvironment();
-+ String javahome = System.getProperty("java.home");
-+ // setting the JAVA_HOME variable in the process execution environment
-+ // needed as otherwise gjdoc will go to kaffe by default
-+ log("Setting JAVA_HOME environment variable for the gjdoc executable process to: "+ javahome, Project.MSG_VERBOSE);
-+ if(env != null) {
-+ for(int i=0; i < env.length; i++) {
-+ if( env[i].startsWith("JAVA_HOME") )
-+ env[i] = "JAVA_HOME=" + javahome;
-+ }
-+ }
-+ else
-+ exe.setEnvironment(new String[] {"JAVA_HOME=" + javahome });
-+
-+ /*
-+ * No reason to change the working directory as all filenames and
-+ * path components have been resolved already.
-+ *
-+ * Avoid problems with command line length in some environments.
-+ */
-+ exe.setWorkingDirectory(null);
-+ try {
-+ exe.setCommandline(toExecute.getCommandline());
-+ int ret = exe.execute();
-+ if (ret != 0 && failOnError) {
-+ throw new BuildException("Gjdoc returned " + ret, getLocation());
-+ }
-+ } catch (IOException e) {
-+ throw new BuildException("Gjdoc failed: " + e, e, getLocation());
-+ } finally {
-+ if (tmpList != null) {
-+ tmpList.delete();
-+ tmpList = null;
-+ }
-+
-+ out.logFlush();
-+ err.logFlush();
-+ try {
-+ out.close();
-+ err.close();
-+ } catch (IOException e) {
-+ // ignore
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Add the files matched by the nested filesets to the Vector as
-+ * SourceFile instances.
-+ *
-+ * @since 1.5
-+ */
-+ private void addFileSets(Vector sf) {
-+ Enumeration e = fileSets.elements();
-+ while (e.hasMoreElements()) {
-+ FileSet fs = (FileSet) e.nextElement();
-+ if (!fs.hasPatterns() && !fs.hasSelectors()) {
-+ fs = (FileSet) fs.clone();
-+ fs.createInclude().setName("**/*.java");
-+ if (includeNoSourcePackages) {
-+ fs.createInclude().setName("**/package.html");
-+ }
-+ }
-+ File baseDir = fs.getDir(getProject());
-+ DirectoryScanner ds = fs.getDirectoryScanner(getProject());
-+ String[] files = ds.getIncludedFiles();
-+ for (int i = 0; i < files.length; i++) {
-+ sf.addElement(new SourceFile(new File(baseDir, files[i])));
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Add the directories matched by the nested dirsets to the Vector
-+ * and the base directories of the dirsets to the Path. It also
-+ * handles the packages and excludepackages attributes and
-+ * elements.
-+ *
-+ * @since 1.5
-+ */
-+ private void parsePackages(Vector pn, Path sp) {
-+ Vector addedPackages = new Vector();
-+ Vector dirSets = (Vector) packageSets.clone();
-+
-+ // for each sourcePath entry, add a directoryset with includes
-+ // taken from packagenames attribute and nested package
-+ // elements and excludes taken from excludepackages attribute
-+ // and nested excludepackage elements
-+ if (sourcePath != null && packageNames.size() > 0) {
-+ PatternSet ps = new PatternSet();
-+ Enumeration e = packageNames.elements();
-+ while (e.hasMoreElements()) {
-+ PackageName p = (PackageName) e.nextElement();
-+ String pkg = p.getName().replace('.', '/');
-+ if (pkg.endsWith("*")) {
-+ pkg += "*";
-+ }
-+ ps.createInclude().setName(pkg);
-+ }
-+
-+ e = excludePackageNames.elements();
-+ while (e.hasMoreElements()) {
-+ PackageName p = (PackageName) e.nextElement();
-+ String pkg = p.getName().replace('.', '/');
-+ if (pkg.endsWith("*")) {
-+ pkg += "*";
-+ }
-+ ps.createExclude().setName(pkg);
-+ }
-+
-+
-+ String[] pathElements = sourcePath.list();
-+ for (int i = 0; i < pathElements.length; i++) {
-+ DirSet ds = new DirSet();
-+ ds.setDefaultexcludes(useDefaultExcludes);
-+ ds.setDir(new File(pathElements[i]));
-+ ds.createPatternSet().addConfiguredPatternset(ps);
-+ dirSets.addElement(ds);
-+ }
-+ }
-+
-+ Enumeration e = dirSets.elements();
-+ while (e.hasMoreElements()) {
-+ DirSet ds = (DirSet) e.nextElement();
-+ File baseDir = ds.getDir(getProject());
-+ log("scanning " + baseDir + " for packages.", Project.MSG_DEBUG);
-+ DirectoryScanner dsc = ds.getDirectoryScanner(getProject());
-+ String[] dirs = dsc.getIncludedDirectories();
-+ boolean containsPackages = false;
-+ for (int i = 0; i < dirs.length; i++) {
-+ // are there any java files in this directory?
-+ File pd = new File(baseDir, dirs[i]);
-+ String[] files = pd.list(new FilenameFilter () {
-+ public boolean accept(File dir1, String name) {
-+ return name.endsWith(".java")
-+ || (includeNoSourcePackages
-+ && name.equals("package.html"));
-+ }
-+ });
-+
-+ if (files.length > 0) {
-+ containsPackages = true;
-+ String packageName =
-+ dirs[i].replace(File.separatorChar, '.');
-+ if (!addedPackages.contains(packageName)) {
-+ addedPackages.addElement(packageName);
-+ pn.addElement(packageName);
-+ }
-+ }
-+ }
-+ if (containsPackages) {
-+ // We don't need to care for duplicates here,
-+ // Path.list does it for us.
-+ sp.createPathElement().setLocation(baseDir);
-+ } else {
-+ log(baseDir + " doesn\'t contain any packages, dropping it.",
-+ Project.MSG_VERBOSE);
-+ }
-+ }
-+ }
-+
-+ private class JavadocOutputStream extends LogOutputStream {
-+ JavadocOutputStream(int level) {
-+ super(Gjdoc.this, level);
-+ }
-+
-+ //
-+ // Override the logging of output in order to filter out Generating
-+ // messages. Generating messages are set to a priority of VERBOSE
-+ // unless they appear after what could be an informational message.
-+ //
-+ private String queuedLine = null;
-+ protected void processLine(String line, int messageLevel) {
-+ if (messageLevel == Project.MSG_INFO
-+ && line.startsWith("Generating ")) {
-+ if (queuedLine != null) {
-+ super.processLine(queuedLine, Project.MSG_VERBOSE);
-+ }
-+ queuedLine = line;
-+ } else {
-+ if (queuedLine != null) {
-+ if (line.startsWith("Building ")) {
-+ super.processLine(queuedLine, Project.MSG_VERBOSE);
-+ } else {
-+ super.processLine(queuedLine, Project.MSG_INFO);
-+ }
-+ queuedLine = null;
-+ }
-+ super.processLine(line, messageLevel);
-+ }
-+ }
-+
-+
-+ protected void logFlush() {
-+ if (queuedLine != null) {
-+ super.processLine(queuedLine, Project.MSG_VERBOSE);
-+ queuedLine = null;
-+ }
-+ }
-+ }
-+
-+ /**
-+ * Convenience method to expand properties.
-+ */
-+ protected String expand(String content) {
-+ return getProject().replaceProperties(content);
-+ }
-+
-+}
Modified: trunk/ant/debian/patches/01_javadoc_maxmemory.patch
===================================================================
--- trunk/ant/debian/patches/01_javadoc_maxmemory.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/01_javadoc_maxmemory.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -9,14 +9,3 @@
<packageset dir="${java.dir}"/>
---- build.xml.orig 2005-07-09 20:51:24.000000000 +0200
-+++ build.xml 2005-07-09 20:42:08.000000000 +0200
-@@ -1352,7 +1352,7 @@
- version="true"
- locale="en"
- windowtitle="${Name} API"
-- doctitle="${Name}">
-+ doctitle="${Name}" maxmemory="256m">
-
- <packageset dir="${java.dir}"/>
-
Modified: trunk/ant/debian/patches/02_ant_add_xerces.patch
===================================================================
--- trunk/ant/debian/patches/02_ant_add_xerces.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/02_ant_add_xerces.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -14,19 +14,3 @@
# Build local classpath using just the launcher in non-rpm mode or
# use the Jpackage helper in rpm mode with basic and default jars
# specified in the ant.conf configuration. Because the launcher is
---- src/script/ant.orig 2005-06-23 16:05:20.000000000 +0200
-+++ src/script/ant 2005-06-23 16:04:20.000000000 +0200
-@@ -125,6 +125,13 @@
- exit 1
- fi
-
-+# Add the Xerces 2 XML parser in the Debian version
-+if [ -z "$LOCALCLASSPATH" ] ; then
-+ LOCALCLASSPATH="/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar"
-+else
-+ LOCALCLASSPATH="/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:$LOCALCLASSPATH"
-+fi
-+
- # Build local classpath using just the launcher in non-rpm mode or
- # use the Jpackage helper in rpm mode with basic and default jars
- # specified in the ant.conf configuration. Because the launcher is
Modified: trunk/ant/debian/patches/03_SplashTaskPatch_a.patch
===================================================================
--- trunk/ant/debian/patches/03_SplashTaskPatch_a.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/03_SplashTaskPatch_a.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -77,82 +77,3 @@
+ return new String(out);
+ }
+ }
---- /dev/null 2005-07-07 19:32:34.024825040 +0200
-+++ src/main/org/apache/tools/ant/util/Base64Converter.java 2005-07-07 20:56:48.000000000 +0200
-@@ -0,0 +1,76 @@
-+ /*********************************************************************
-+ * BASE 64 encoding of a String or an array of bytes.
-+ *
-+ * Based on RFC 1421.
-+ *
-+ *********************************************************************/
-+
-+package org.apache.tools.ant.util;
-+
-+ public class Base64Converter {
-+
-+ public final char[] alphabet = {
-+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0 to 7
-+ 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 8 to 15
-+ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 16 to 23
-+ 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', // 24 to 31
-+ 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', // 32 to 39
-+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', // 40 to 47
-+ 'w', 'x', 'y', 'z', '0', '1', '2', '3', // 48 to 55
-+ '4', '5', '6', '7', '8', '9', '+', '/'}; // 56 to 63
-+
-+ public String encode(String s) {
-+ return encode(s.getBytes());
-+ }
-+
-+ public String encode(byte[] octetString) {
-+ int bits24;
-+ int bits6;
-+
-+ char[] out = new char[((octetString.length - 1) / 3 + 1) * 4];
-+ int outIndex = 0;
-+ int i = 0;
-+
-+ while ((i + 3) <= octetString.length) {
-+ // store the octets
-+ bits24 = (octetString[i++] & 0xFF) << 16;
-+ bits24 |= (octetString[i++] & 0xFF) << 8;
-+ bits24 |= octetString[i++];
-+
-+ bits6 = (bits24 & 0x00FC0000) >> 18;
-+ out[outIndex++] = alphabet[bits6];
-+ bits6 = (bits24 & 0x0003F000) >> 12;
-+ out[outIndex++] = alphabet[bits6];
-+ bits6 = (bits24 & 0x00000FC0) >> 6;
-+ out[outIndex++] = alphabet[bits6];
-+ bits6 = (bits24 & 0x0000003F);
-+ out[outIndex++] = alphabet[bits6];
-+ }
-+ if (octetString.length - i == 2) {
-+ // store the octets
-+ bits24 = (octetString[i] & 0xFF) << 16;
-+ bits24 |= (octetString[i + 1] & 0xFF) << 8;
-+ bits6 = (bits24 & 0x00FC0000) >> 18;
-+ out[outIndex++] = alphabet[bits6];
-+ bits6 = (bits24 & 0x0003F000) >> 12;
-+ out[outIndex++] = alphabet[bits6];
-+ bits6 = (bits24 & 0x00000FC0) >> 6;
-+ out[outIndex++] = alphabet[bits6];
-+
-+ // padding
-+ out[outIndex++] = '=';
-+ } else if (octetString.length - i == 1) {
-+ // store the octets
-+ bits24 = (octetString[i] & 0xFF) << 16;
-+ bits6 = (bits24 & 0x00FC0000) >> 18;
-+ out[outIndex++] = alphabet[bits6];
-+ bits6 = (bits24 & 0x0003F000) >> 12;
-+ out[outIndex++] = alphabet[bits6];
-+
-+ // padding
-+ out[outIndex++] = '=';
-+ out[outIndex++] = '=';
-+ }
-+ return new String(out);
-+ }
-+ }
Modified: trunk/ant/debian/patches/03_SplashTaskPatch_b.patch
===================================================================
--- trunk/ant/debian/patches/03_SplashTaskPatch_b.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/03_SplashTaskPatch_b.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -89,94 +89,3 @@
public interface DownloadProgress {
/**
---- src/main/org/apache/tools/ant/taskdefs/Get.java.orig 2005-07-07 21:22:22.000000000 +0200
-+++ src/main/org/apache/tools/ant/taskdefs/Get.java 2005-07-06 20:02:29.000000000 +0200
-@@ -22,6 +22,7 @@
- import org.apache.tools.ant.Task;
- import org.apache.tools.ant.util.FileUtils;
- import org.apache.tools.ant.util.JavaEnvUtils;
-+import org.apache.tools.ant.util.Base64Converter;
-
- import java.io.File;
- import java.io.FileOutputStream;
-@@ -336,80 +337,6 @@
- this.pword = p;
- }
-
-- /*********************************************************************
-- * BASE 64 encoding of a String or an array of bytes.
-- *
-- * Based on RFC 1421.
-- *
-- *********************************************************************/
--
-- protected static class Base64Converter {
--
-- public final char[] alphabet = {
-- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', // 0 to 7
-- 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 8 to 15
-- 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 16 to 23
-- 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', // 24 to 31
-- 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', // 32 to 39
-- 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', // 40 to 47
-- 'w', 'x', 'y', 'z', '0', '1', '2', '3', // 48 to 55
-- '4', '5', '6', '7', '8', '9', '+', '/'}; // 56 to 63
--
-- public String encode(String s) {
-- return encode(s.getBytes());
-- }
--
-- public String encode(byte[] octetString) {
-- int bits24;
-- int bits6;
--
-- char[] out = new char[((octetString.length - 1) / 3 + 1) * 4];
-- int outIndex = 0;
-- int i = 0;
--
-- while ((i + 3) <= octetString.length) {
-- // store the octets
-- bits24 = (octetString[i++] & 0xFF) << 16;
-- bits24 |= (octetString[i++] & 0xFF) << 8;
-- bits24 |= octetString[i++];
--
-- bits6 = (bits24 & 0x00FC0000) >> 18;
-- out[outIndex++] = alphabet[bits6];
-- bits6 = (bits24 & 0x0003F000) >> 12;
-- out[outIndex++] = alphabet[bits6];
-- bits6 = (bits24 & 0x00000FC0) >> 6;
-- out[outIndex++] = alphabet[bits6];
-- bits6 = (bits24 & 0x0000003F);
-- out[outIndex++] = alphabet[bits6];
-- }
-- if (octetString.length - i == 2) {
-- // store the octets
-- bits24 = (octetString[i] & 0xFF) << 16;
-- bits24 |= (octetString[i + 1] & 0xFF) << 8;
-- bits6 = (bits24 & 0x00FC0000) >> 18;
-- out[outIndex++] = alphabet[bits6];
-- bits6 = (bits24 & 0x0003F000) >> 12;
-- out[outIndex++] = alphabet[bits6];
-- bits6 = (bits24 & 0x00000FC0) >> 6;
-- out[outIndex++] = alphabet[bits6];
--
-- // padding
-- out[outIndex++] = '=';
-- } else if (octetString.length - i == 1) {
-- // store the octets
-- bits24 = (octetString[i] & 0xFF) << 16;
-- bits6 = (bits24 & 0x00FC0000) >> 18;
-- out[outIndex++] = alphabet[bits6];
-- bits6 = (bits24 & 0x0003F000) >> 12;
-- out[outIndex++] = alphabet[bits6];
--
-- // padding
-- out[outIndex++] = '=';
-- out[outIndex++] = '=';
-- }
-- return new String(out);
-- }
-- }
-
- public interface DownloadProgress {
- /**
Modified: trunk/ant/debian/patches/03_SplashTaskPatch_c.patch
===================================================================
--- trunk/ant/debian/patches/03_SplashTaskPatch_c.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/03_SplashTaskPatch_c.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -21,26 +21,3 @@
conn.setRequestProperty("Proxy-Authorization",
encodedcreds);
}
---- src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java.orig 2005-07-07 21:24:19.000000000 +0200
-+++ src/main/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.java 2005-07-06 20:05:46.000000000 +0200
-@@ -27,6 +27,7 @@
- import org.apache.tools.ant.BuildException;
- import org.apache.tools.ant.Project;
- import org.apache.tools.ant.Task;
-+import org.apache.tools.ant.util.Base64Converter;
-
- /**
- * Creates a splash screen. The splash screen is displayed
-@@ -128,8 +129,10 @@
-
- conn = url.openConnection();
- if (user != null && user.length() > 0) {
-- String encodedcreds =
-- new sun.misc.BASE64Encoder().encode((new String(user + ":" + password)).getBytes());
-+ // converted from sun internal classes to new Base64Converter
-+ // utility class extracted from Get task
-+ Base64Converter encoder = new Base64Converter();
-+ String encodedcreds = encoder.encode( (new String(user + ":" + password)).getBytes() );
- conn.setRequestProperty("Proxy-Authorization",
- encodedcreds);
- }
Modified: trunk/ant/debian/patches/04_UUMailerReflection.patch
===================================================================
--- trunk/ant/debian/patches/04_UUMailerReflection.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/04_UUMailerReflection.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -34,39 +34,3 @@
} finally {
finstr.close();
}
---- src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java.orig 2005-07-07 21:25:57.000000000 +0200
-+++ src/main/org/apache/tools/ant/taskdefs/email/UUMailer.java 2005-07-06 20:46:21.000000000 +0200
-@@ -22,7 +22,9 @@
- import java.io.IOException;
- import java.io.PrintStream;
- import org.apache.tools.ant.BuildException;
--import sun.misc.UUEncoder;
-+
-+import java.lang.reflect.Constructor;
-+import java.lang.reflect.Method;
-
- /**
- * An emailer that uuencodes attachments.
-@@ -42,10 +44,18 @@
-
- try {
- BufferedInputStream in = new BufferedInputStream(finstr);
-- UUEncoder encoder = new UUEncoder(file.getName());
--
-- encoder.encode(in, out);
--
-+ try {
-+ Class encoder = Class.forName("sun.misc.UUEncoder");
-+ Constructor constructor = encoder.getConstructor( new Class[] { String.class } );
-+ Method encoderMethod = encoder.getMethod("encode", new Class[] { BufferedInputStream.class, PrintStream.class });
-+ Object encoderInstance = constructor.newInstance( new Object[] { file.getName() } );
-+ encoderMethod.invoke( encoderInstance, new Object[] {in, out} );
-+ }
-+ catch(Throwable e) {
-+ // just catch everything and rethrow as it is catched and interpreted as initialization error
-+ // in calling method - which is the right way to handle
-+ throw new IOException();
-+ }
- } finally {
- finstr.close();
- }
Modified: trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch
===================================================================
--- trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/05_TaskAvailabilityFix_ANT_PR38260.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,126 +1,63 @@
--- src/main/org/apache/tools/ant/taskdefs/Available.java.orig 2005-06-02 15:19:56.000000000 +0200
+++ src/main/org/apache/tools/ant/taskdefs/Available.java 2006-01-16 14:45:39.000000000 +0100
@@ -253,32 +253,35 @@
- appendix = " to set property " + property;
- } else {
- setTaskName("available");
-- }
-- if ((classname != null) && !checkClass(classname)) {
-- log("Unable to load class " + classname + appendix,
-- Project.MSG_VERBOSE);
-- return false;
-- }
-- if ((file != null) && !checkFile()) {
-- StringBuffer buf = new StringBuffer("Unable to find ");
-- if (type != null) {
-- buf.append(type).append(' ');
+ appendix = " to set property " + property;
+ } else {
+ setTaskName("available");
+- }
+- if ((classname != null) && !checkClass(classname)) {
+- log("Unable to load class " + classname + appendix,
+- Project.MSG_VERBOSE);
+- return false;
+- }
+- if ((file != null) && !checkFile()) {
+- StringBuffer buf = new StringBuffer("Unable to find ");
+- if (type != null) {
+- buf.append(type).append(' ');
+ }
+ try {
-+ if ((classname != null) && !checkClass(classname)) {
-+ log("Unable to load class " + classname + appendix,
-+ Project.MSG_VERBOSE);
-+ return false;
- }
-- buf.append(filename).append(appendix);
-- log(buf.toString(), Project.MSG_VERBOSE);
-- return false;
-- }
-- if ((resource != null) && !checkResource(resource)) {
-- log("Unable to load resource " + resource + appendix,
-- Project.MSG_VERBOSE);
-- return false;
-- }
-- if (loader != null) {
-- loader.cleanup();
-- loader = null;
-- }
-- if (!isTask) {
-- setTaskName(null);
-+ if ((file != null) && !checkFile()) {
-+ StringBuffer buf = new StringBuffer("Unable to find ");
-+ if (type != null) {
-+ buf.append(type).append(' ');
-+ }
-+ buf.append(filename).append(appendix);
-+ log(buf.toString(), Project.MSG_VERBOSE);
-+ return false;
-+ }
-+ if ((resource != null) && !checkResource(resource)) {
-+ log("Unable to load resource " + resource + appendix,
-+ Project.MSG_VERBOSE);
-+ return false;
++ if ((classname != null) && !checkClass(classname)) {
++ log("Unable to load class " + classname + appendix,
++ Project.MSG_VERBOSE);
++ return false;
+ }
+- buf.append(filename).append(appendix);
+- log(buf.toString(), Project.MSG_VERBOSE);
+- return false;
+- }
+- if ((resource != null) && !checkResource(resource)) {
+- log("Unable to load resource " + resource + appendix,
+- Project.MSG_VERBOSE);
+- return false;
+- }
+- if (loader != null) {
+- loader.cleanup();
+- loader = null;
+- }
+- if (!isTask) {
+- setTaskName(null);
++ if ((file != null) && !checkFile()) {
++ StringBuffer buf = new StringBuffer("Unable to find ");
++ if (type != null) {
++ buf.append(type).append(' ');
++ }
++ buf.append(filename).append(appendix);
++ log(buf.toString(), Project.MSG_VERBOSE);
++ return false;
+ }
-+ } finally {
-+ if (loader != null) {
-+ loader.cleanup();
-+ loader = null;
-+ }
-+ if (!isTask) {
-+ setTaskName(null);
++ if ((resource != null) && !checkResource(resource)) {
++ log("Unable to load resource " + resource + appendix,
++ Project.MSG_VERBOSE);
++ return false;
+ }
- }
- return true;
- }
---- src/main/org/apache/tools/ant/taskdefs/Available.java.orig 2005-06-02 15:19:56.000000000 +0200
-+++ src/main/org/apache/tools/ant/taskdefs/Available.java 2006-01-16 14:45:39.000000000 +0100
-@@ -253,32 +253,35 @@
- appendix = " to set property " + property;
- } else {
- setTaskName("available");
-- }
-- if ((classname != null) && !checkClass(classname)) {
-- log("Unable to load class " + classname + appendix,
-- Project.MSG_VERBOSE);
-- return false;
-- }
-- if ((file != null) && !checkFile()) {
-- StringBuffer buf = new StringBuffer("Unable to find ");
-- if (type != null) {
-- buf.append(type).append(' ');
-+ }
-+ try {
-+ if ((classname != null) && !checkClass(classname)) {
-+ log("Unable to load class " + classname + appendix,
-+ Project.MSG_VERBOSE);
-+ return false;
- }
-- buf.append(filename).append(appendix);
-- log(buf.toString(), Project.MSG_VERBOSE);
-- return false;
-- }
-- if ((resource != null) && !checkResource(resource)) {
-- log("Unable to load resource " + resource + appendix,
-- Project.MSG_VERBOSE);
-- return false;
-- }
-- if (loader != null) {
-- loader.cleanup();
-- loader = null;
-- }
-- if (!isTask) {
-- setTaskName(null);
-+ if ((file != null) && !checkFile()) {
-+ StringBuffer buf = new StringBuffer("Unable to find ");
-+ if (type != null) {
-+ buf.append(type).append(' ');
-+ }
-+ buf.append(filename).append(appendix);
-+ log(buf.toString(), Project.MSG_VERBOSE);
-+ return false;
-+ }
-+ if ((resource != null) && !checkResource(resource)) {
-+ log("Unable to load resource " + resource + appendix,
-+ Project.MSG_VERBOSE);
-+ return false;
++ } finally {
++ if (loader != null) {
++ loader.cleanup();
++ loader = null;
+ }
-+ } finally {
-+ if (loader != null) {
-+ loader.cleanup();
-+ loader = null;
-+ }
-+ if (!isTask) {
-+ setTaskName(null);
++ if (!isTask) {
++ setTaskName(null);
+ }
- }
- return true;
- }
+ }
+ return true;
+ }
Modified: trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch
===================================================================
--- trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/patches/06_Bug126477_UpstreamPR38027.patch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,30 +1,30 @@
--- src/main/org/apache/tools/tar/TarOutputStream.java.orig 2005-06-02 15:20:10.000000000 +0200
+++ src/main/org/apache/tools/tar/TarOutputStream.java 2006-04-07 19:36:04.000000000 +0200
@@ -50,7 +50,9 @@
- protected int assemLen;
- protected byte[] assemBuf;
- protected TarBuffer buffer;
-- protected int longFileMode = LONGFILE_ERROR;
+ protected int assemLen;
+ protected byte[] assemBuf;
+ protected TarBuffer buffer;
+- protected int longFileMode = LONGFILE_ERROR;
+ protected int longFileMode = LONGFILE_ERROR;
+
-+ private boolean closed = false;
-
- public TarOutputStream(OutputStream os) {
- this(os, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE);
++ private boolean closed = false;
+
+ public TarOutputStream(OutputStream os) {
+ this(os, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE);
@@ -110,9 +112,13 @@
- * This means that finish() is called followed by calling the
- * TarBuffer's close().
- */
-- public void close() throws IOException {
-- this.finish();
-- this.buffer.close();
+ * This means that finish() is called followed by calling the
+ * TarBuffer's close().
+ */
+- public void close() throws IOException {
+- this.finish();
+- this.buffer.close();
+ public void close() throws IOException {
+ if (!closed) {
+ this.finish();
+ this.buffer.close();
+ out.close();
+ closed = true;
-+ }
- }
-
- /**
++ }
+ }
+
+ /**
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/rules 2006-06-29 17:30:23 UTC (rev 2220)
@@ -51,56 +51,3 @@
clean::
-rm -f gjdoc_rawcomment.cache
-rm -rf bin bootstrap build lib/*.jar
-#!/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
-
-# needs to be exported for direct ant call
-export JAVA_HOME := /usr/lib/kaffe
-# needed for bootstrap.sh
-export JAVAC=/usr/bin/ecj
-# needed for bootstrap
-export BOOTJAVAC_OPTS=-bootclasspath /usr/lib/kaffe/jre/lib/rt.jar -source 1.3 -target 1.3 -nowarn
-# needed for building with bootstrap ant
-export ANT_HOME := bootstrap
-
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=false
-else
- export ANT_OPTS=-Dcompile.debug=true -Dcompile.optimize=true
-endif
-
-JAR_PATH := /usr/share/java
-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
-
- # the rest
- /bin/sh bootstrap/bin/ant -lib ${CLASSPATH} -propertyfile debian/ant.properties jars javadocs
-
-
-install/ant::
- # Installing these files does not work with dh_install because of
- # the file permissions
- mkdir -p debian/ant/usr/share/ant/bin
- 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
-
-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 -f gjdoc_rawcomment.cache
- -rm -rf bin bootstrap build lib/*.jar
Modified: trunk/ant/debian/watch
===================================================================
--- trunk/ant/debian/watch 2006-06-28 19:56:50 UTC (rev 2219)
+++ trunk/ant/debian/watch 2006-06-29 17:30:23 UTC (rev 2220)
@@ -1,4 +1,2 @@
version=2
http://www.apache.org/dist/ant/source/apache-ant-(.*)-src\.tar\.gz debian uupdate
-version=2
-http://www.apache.org/dist/ant/source/apache-ant-(.*)-src\.tar\.gz debian uupdate
More information about the pkg-java-commits
mailing list