conor 00/10/29 05:10:28
Modified: src/main/org/apache/tools/ant/taskdefs Javadoc.java
Log:
Restore the -d flag for destdir when it is supplied. Whilst this is an option
of the standard doclet, many other doclets also use it. For doclets which do
not
like it, simply do not provide a destdir attribute to the javadoc tag.
The check for whether destDir is supplied only operated if the standard doclet
is being used (or using javadoc1)
Based on the observation of Scott M Stark <[EMAIL PROTECTED]>
Revision Changes Path
1.35 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Javadoc.java 2000/09/14 13:36:45 1.34
+++ Javadoc.java 2000/10/29 13:10:28 1.35
@@ -241,6 +241,8 @@
public void setDestdir(File dir) {
destDir = dir;
+ cmd.createArgument().setValue("-d");
+ cmd.createArgument().setFile(destDir);
}
public void setSourcefiles(String src) {
sourceFiles = src;
@@ -581,9 +583,8 @@
String msg = "destDir attribute must be set!";
throw new BuildException(msg);
}
- toExecute.createArgument().setValue("-d");
- toExecute.createArgument().setFile(destDir);
}
+
// --------------------------------- javadoc2 arguments for default doclet
