From 2f003461287b7059beff6f37c7a8769af29dd58a Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Sun, 29 Oct 2000 13:10:28 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268131 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 7a30b0dd9..d3ce89099 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -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