[ant] 01/01: Do not set the javadoc encoding/locale parameters if already set with a <arg/> element (Closes: #823773)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ant.

commit 873c493a8894fccdb5cec1480f456f9d4bc63df9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 16 15:14:06 2016 +0200

    Do not set the javadoc encoding/locale parameters if already set with a <arg/> element (Closes: #823773)
---
 debian/changelog                                   |  7 +++++
 .../patches/0010-reproducible-javadoc-task.patch   | 34 +++-------------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8859879..9e7134c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ant (1.9.7-3) unstable; urgency=medium
+
+  * Do not set the javadoc encoding/locale parameters if they were already
+    set with a <arg/> element (Closes: #823773)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 May 2016 15:14:43 +0200
+
 ant (1.9.7-2) unstable; urgency=medium
 
   * Do not set the javadoc encoding twice (Closes: #821065)
diff --git a/debian/patches/0010-reproducible-javadoc-task.patch b/debian/patches/0010-reproducible-javadoc-task.patch
index 2679867..937d795 100644
--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -5,42 +5,16 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
 +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -472,6 +472,8 @@
-     private String excludeDocFilesSubDir = null;
-     private String docEncoding = null;
-     private boolean postProcessGeneratedJavadocs = true;
-+    private String locale;
-+    private String encoding;
- 
-     private final ResourceCollectionContainer nestedSourceFiles
-         = new ResourceCollectionContainer();
-@@ -895,6 +897,8 @@
-      * @param locale the locale to use.
-      */
-     public void setLocale(final String locale) {
-+        this.locale = locale;
-+
-         // createArgument(true) is necessary to make sure -locale
-         // is the first argument (required in 1.3+).
-         cmd.createArgument(true).setValue(locale);
-@@ -907,6 +911,8 @@
-      * @param enc the name of the encoding for the source files.
-      */
-     public void setEncoding(final String enc) {
-+        this.encoding = enc;
-+
-         cmd.createArgument().setValue("-encoding");
-         cmd.createArgument().setValue(enc);
-     }
-@@ -1703,6 +1709,15 @@
+@@ -1703,6 +1703,16 @@
       */
      @Override
      public void execute() throws BuildException {
 +        if (System.getenv("SOURCE_DATE_EPOCH") != null) {
-+            if (locale == null) {
++            java.util.List<String> arguments = java.util.Arrays.asList(cmd.getCommandline());
++            if (!arguments.contains("-locale")) {
 +                setLocale("en");
 +            }
-+            if (encoding == null) {
++            if (!arguments.contains("-encoding")) {
 +                setEncoding("UTF-8");
 +            }
 +        }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git