Browse Source

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 <Scott_Stark@displayscape.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268131 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 24 years ago
parent
commit
2f00346128
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 3
- 2
src/main/org/apache/tools/ant/taskdefs/Javadoc.java View File

@@ -241,6 +241,8 @@ public class Javadoc extends Task {

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 @@ public class Javadoc extends Task {
String msg = "destDir attribute must be set!";
throw new BuildException(msg);
}
toExecute.createArgument().setValue("-d");
toExecute.createArgument().setFile(destDir);
}

// --------------------------------- javadoc2 arguments for default doclet



Loading…
Cancel
Save