Browse Source

Make sure locale argument is the first one in javadoc

PR: 4984


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272200 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
2e62a659cb
2 changed files with 5 additions and 2 deletions
  1. +1
    -0
      build.xml
  2. +4
    -2
      src/main/org/apache/tools/ant/taskdefs/Javadoc.java

+ 1
- 0
build.xml View File

@@ -1041,6 +1041,7 @@
destdir="${build.javadocs}" destdir="${build.javadocs}"
author="true" author="true"
version="true" version="true"
locale="en"
windowtitle="${Name} API" windowtitle="${Name} API"
doctitle="${Name}"> doctitle="${Name}">
<tag name="todo" description="To do:" scope="all" /> <tag name="todo" description="To do:" scope="all" />


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

@@ -480,8 +480,10 @@ public class Javadoc extends Task {
} }
public void setLocale(String src) { public void setLocale(String src) {
if (!javadoc1) { if (!javadoc1) {
cmd.createArgument().setValue("-locale");
cmd.createArgument().setValue(src);
// createArgument(true) is necessary to make sure, -locale
// is the first argument (required in 1.3+).
cmd.createArgument(true).setValue(src);
cmd.createArgument(true).setValue("-locale");
} }
} }
public void setEncoding(String enc) { public void setEncoding(String enc) {


Loading…
Cancel
Save