bodewig 00/07/14 04:49:58
Modified: . bootstrap.sh
docs index.html
src/main/org/apache/tools/ant/taskdefs Javac.java
Log:
Documentation for the Path elements, made nested src element of Javac
use Path as well.
Revision Changes Path
1.17 +2 -0 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bootstrap.sh 2000/07/13 15:23:41 1.16
+++ bootstrap.sh 2000/07/14 11:49:56 1.17
@@ -1,5 +1,7 @@
#!/bin/sh
+# You will need to specify JAVA_HOME if compiling with 1.2 or later.
+
ANT_HOME=.
export ANT_HOME
1.47 +64 -15 jakarta-ant/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/index.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- index.html 2000/07/12 14:05:10 1.46
+++ index.html 2000/07/14 11:49:57 1.47
@@ -395,6 +395,38 @@
</pre>
</blockquote>
+<h3><a name="path">PATH like structures</a></h3>
+<p>You can specify PATH and CLASSPATH variables using both
+":" and ";" as separator characters, Ant will
+convert it to the correct character of the current operating
+system.</p>
+<p>Wherever PATH like values need to be specified a nested element can
+be used. This takes the general form of</p>
+<pre>
+ <classpath>
+ <pathelement path="${classpath}" />
+ <pathelement location="lib/helper.jar" />
+ </classpath>
+</pre>
+<p>The <code>location</code> attribute specifies a single file or
+directory relative to the project's base directory (or an absolute
+filename), while the <code>path</code> attribute accepts ":"
+or ";" separated lists of locations. The <code>path</code>
+attribute is intended to be used with predefined paths - in any other
+case multiple elements with <code>location</code> attributes should be
+preferred.</p>
+<p>As a shortcut the surrounding PATH element supports path and
+location attributes of its own, so</p>
+<pre>
+ <classpath>
+ <pathelement path="${classpath}" />
+ </classpath>
+</pre>
+<p>can be abreviated to</p>
+<pre>
+ <classpath path="${classpath}" />
+</pre>
+
<hr>
<h2><a name="directorybasedtasks">Directory based tasks</a></h2>
<p>Some tasks use directory trees for the task they perform. For instance,
the <a
@@ -1013,6 +1045,7 @@
</pre>
<p>deletes all files with the extension "<code>.bak</code>" from
the current directory
and any sub-directories.</p>
+<hr>
<h2><a name="deltree">Deltree</a></h2>
<h3>Description</h3>
<p>Deletes a directory with all its files and subdirectories.</p>
@@ -1607,6 +1640,19 @@
<td align="center" valign="top">No</td>
</tr>
</table>
+<h3>Parameters specified as nested elements</h3>
+<p><code>Java</code>'s <em>classpath</em> attribute is a <a
+href="#path">PATH like structure</a> and can also be set via a nested
+<em>classpath</em> element.</p>
+<h4>Example</h4>
+<pre>
+ <java classname="test.Main" args="-h" >
+ <classpath>
+ <pathelement location="\test.jar" />
+ <pathelement path="${java.class.path}" />
+ </classpath>
+ </java>
+</pre>
<h3>Examples</h3>
<pre> <java classname="test.Main" /></pre>
<pre> <java classname="test.Main" args="-h"
/></pre>
@@ -1747,21 +1793,12 @@
Multiple <code>src</code> elements may be present and each specifies a
source path which will be
searched by Javac for classes to compile.
-<h4>src</h4>
-Define a source path to be search for source files.
-<H4>Parameters</h4>
-<table width="60%" border="1" cellpadding="2" cellspacing="0">
- <tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td align="center" valign="top"><b>Required</b></td>
- </tr>
- <tr>
- <td valign="top">src</td>
- <td valign="top">A source path. It may contain multiple elements
separated with either a ';' or a ':'</td>
- <td align="center" valign="top">Yes</td>
- </tr>
-</table>
+<h4>src, classpath, bootclasspath and extdirs</h4>
+<p><code>Javac</code>'s <em>srcdir</em>, <em>classpath</em>,
+<em>bootclasspath</em> and <em>extdirs</em> attributes are <a
+href="#path">PATH like structure</a> and can also be set via nested
+<em>src</em>, <em>classpath</em>, <em>bootclasspath</em> and
+<em>extdirs</em> elements respectively.</p>
<h3>Examples</h3>
<pre> <javac srcdir="${src}"
@@ -2181,6 +2218,13 @@
</tr>
</table>
+<h4>sourcepath, classpath and bootclasspath</h4>
+<p><code>Javadoc</code>'s <em>sourcepath</em>, <em>classpath</em> and
+<em>bootclasspath</em> attributes are <a href="#path">PATH like
+structure</a> and can also be set via nested <em>sourcepath</em>,
+<em>classpath</em> and <em>bootclasspath</em> elements
+respectively.</p>
+
<h3>Example</h3>
<pre> <javadoc packagenames="com.dummy.test.*"
sourcepath="src"
@@ -2608,6 +2652,11 @@
<td align="center" valign="top">No</td>
</tr>
</table>
+<h3>Parameters specified as nested elements</h3>
+<h4>classpath</h4>
+<p><code>Rmic</code>'s <em>classpath</em> attribute is a <a
+href="#path">PATH like structure</a> and can also be set via a nested
+<em>classpath</em> elements.</p>
<h3>Examples</h3>
<pre> <rmic classname="com.xyz.FooBar"
base="${build}/classes" /></pre>
<p>runs the rmic compiler for the class <code>com.xyz.FooBar</code>. The
1.22 +28 -95
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Javac.java 2000/07/14 08:25:52 1.21
+++ Javac.java 2000/07/14 11:49:57 1.22
@@ -88,26 +88,13 @@
public class Javac extends MatchingTask {
- public class SourcePathElement {
- private String path;
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getPath() {
- return path;
- }
- };
-
/**
* Integer returned by the "Modern" jdk1.3 compiler to indicate success.
*/
private static final int
MODERN_COMPILER_SUCCESS = 0;
- private Vector srcPathElements = new Vector();
- private Vector srcDirs= new Vector();
+ private Path src;
private File destDir;
private Path compileClasspath;
private boolean debug = false;
@@ -126,54 +113,23 @@
* support.
*
* @return a nexted src element.
- */
- public SourcePathElement createSrc() {
- SourcePathElement element = new SourcePathElement();
- srcPathElements.addElement(element);
- return element;
- }
-
- /**
- * Add a single directory to the collection of directories that
- * make up the source path.
- *
- * @param srcDirName the name of the directory to add to the list of
source directories.
*/
- private void addSrcDir(String srcDirName) {
- addSrcDir(project.resolveFile(srcDirName));
- }
-
- /**
- * Add a single directory to the collection of directories that
- * make up the source path.
- *
- * @param srcDir the directory to add to the list of source directories.
- */
- private void addSrcDir(File srcDir) {
- srcDirs.addElement(srcDir);
- }
-
- /**
- * Add a set of source directories specified as path.
- *
- * @param srcPath the list of source directories.
- */
- private void addSrcPath(String srcPath) {
- // use a Path tokenizer to find the paths and add them to
- // the vector of source paths.
- PathTokenizer tokenizer = new PathTokenizer(srcPath);
- while (tokenizer.hasMoreTokens()) {
- addSrcDir(tokenizer.nextToken());
+ public Path createSrc() {
+ if (src != null) {
+ src = new Path();
}
- }
+ return src;
+ }
/**
* Set the source dirs to find the source Java files.
*/
- public void setSrcdir(String srcPath) {
- // clean out the list of source dirs
- srcDirs = new Vector();
- addSrcPath(srcPath);
+ public void setSrcdir(Path srcDir) {
+ if (src == null) {
+ src = srcDir;
+ } else {
+ src.append(srcDir);
+ }
}
/**
@@ -291,23 +247,15 @@
public void execute() throws BuildException {
// first off, make sure that we've got a srcdir and destdir
- // process the source elements into the srcDirs collection
- for (Enumeration e = srcPathElements.elements();
e.hasMoreElements(); ) {
- SourcePathElement element = (SourcePathElement)e.nextElement();
- addSrcPath(element.getPath());
- }
-
- if (srcDirs.size() == 0) {
+ if (src == null) {
throw new BuildException("srcdir attribute must be set!");
}
- for (Enumeration e = srcDirs.elements(); e.hasMoreElements(); ) {
- File srcDir = (File)e.nextElement();
- if (!srcDir.exists()) {
- throw new BuildException("srcdir " + srcDir.getPath() + "
does not exist!");
- }
+ String [] list = src.list();
+ if (list.length == 0) {
+ throw new BuildException("srcdir attribute must be set!");
}
-
+
if (destDir == null) {
throw new BuildException("destdir attribute must be set!");
}
@@ -315,15 +263,19 @@
// scan source directories and dest directory to build up both copy
lists and
// compile lists
resetFileLists();
- for (Enumeration e = srcDirs.elements(); e.hasMoreElements(); ) {
- File srcDir = (File)e.nextElement();
+ for (int i=0; i<list.length; i++) {
+ File srcDir = (File)project.resolveFile(list[i]);
+ if (!srcDir.exists()) {
+ throw new BuildException("srcdir " + srcDir.getPath() + "
does not exist!");
+ }
+
DirectoryScanner ds = this.getDirectoryScanner(srcDir);
String[] files = ds.getIncludedFiles();
scanDir(srcDir, destDir, files);
}
-
+
// compile the source files
String compiler = project.getProperty("build.compiler");
@@ -500,25 +452,6 @@
}
/**
- * Get the list of source directories separated by a platform specific
- * path separator.
- *
- * @return the current source directories in a single path separated
using the
- * platform specific path separator.
- */
- private String getSourcePath() {
- String sourcePath = "";
- for (Enumeration e = srcDirs.elements(); e.hasMoreElements(); ) {
- File srcDir = (File)e.nextElement();
- if (sourcePath.length() != 0) {
- sourcePath += File.pathSeparator;
- }
- sourcePath += srcDir.getAbsolutePath();
- }
- return sourcePath;
- }
-
- /**
* Peforms a copmile using the classic compiler that shipped with
* JDK 1.1 and 1.2.
*/
@@ -537,11 +470,11 @@
// Just add "sourcepath" to classpath ( for JDK1.1 )
if (Project.getJavaVersion().startsWith("1.1")) {
argList.addElement(classpath.toString() + File.pathSeparator +
- getSourcePath());
+ src.toString());
} else {
argList.addElement(classpath.toString());
argList.addElement("-sourcepath");
- argList.addElement(getSourcePath());
+ argList.addElement(src.toString());
if (target != null) {
argList.addElement("-target");
argList.addElement(target);
@@ -624,7 +557,7 @@
argList.addElement("-classpath");
argList.addElement(classpath.toString());
argList.addElement("-sourcepath");
- argList.addElement(getSourcePath());
+ argList.addElement(src.toString());
if (target != null) {
argList.addElement("-target");
argList.addElement(target);
@@ -717,7 +650,7 @@
// Jikes has no option for source-path so we
// will add it to classpath.
- classpath.setPath(getSourcePath());
+ classpath.append(src);
Vector argList = new Vector();
