[javatools] 01/01: jh_build: Use ISO8859-1 as the default encoding to avoid unmappable character errors (Closes: #866845)

[Emmanuel Bourg]

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

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

commit baff5c885e1b7ce2033568f6da173ac25e72f741
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 3 00:42:08 2017 +0200

    jh_build: Use ISO8859-1 as the default encoding to avoid unmappable character errors (Closes: #866845)
---
 debian/changelog | 8 ++++++++
 jh_build         | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 57a2cf6..c37e481 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+javatools (0.61) unstable; urgency=medium
+
+  * Team upload.
+  * jh_build: Use ISO8859-1 as the default encoding to avoid unmappable
+    character errors (Closes: #866845)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 03 Jul 2017 00:18:51 +0200
+
 javatools (0.60) unstable; urgency=medium
 
   * Team upload.
diff --git a/jh_build b/jh_build
index 191a23f..1f632ef 100755
--- a/jh_build
+++ b/jh_build
@@ -49,6 +49,11 @@ fi
 JH_JAVAC_OPTS="`getarg o javacopts`"
 JH_JAVADOC_OPTS="`getarg O javadoc-opts`"
 
+if ! grep -- -encoding <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+    # Use ISO8859-1 as the default encoding to avoid unmappable character errors
+    JH_JAVAC_OPTS="-encoding ISO8859-1 $JH_JAVAC_OPTS"
+fi
+
 if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
     if ! grep -- -target <<< "$JH_JAVAC_OPTS" &>/dev/null; then
 	JH_JAVAC_OPTS="-source 1.7 -target 1.7 $JH_JAVAC_OPTS"
@@ -65,6 +70,10 @@ if ! grep -- -notimestamp <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
 	JH_JAVADOC_OPTS="-notimestamp $JH_JAVADOC_OPTS"
 fi
 
+if ! grep -- -encoding <<< "$JH_JAVADOC_OPTS" &>/dev/null; then
+    JH_JAVADOC_OPTS="-encoding ISO8859-1 $JH_JAVADOC_OPTS"
+fi
+
 function dobuild()
 {
 

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