[SCM] UNNAMED PROJECT branch, master, updated. 0.42-3-g965fbe4

[Niels Thykier]

The following commit has been merged in the master branch:
commit 265595433dd42bd27fad61220dc29a4ac4675f52
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jun 20 19:02:53 2012 +0200

    Make jh_build pass -target by default
    
    Signed-off-by: Niels Thykier <niels at thykier.net>

diff --git a/debian/changelog b/debian/changelog
index b0fa238..cd311ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ javatools (0.43) UNRELEASED; urgency=low
 
   * Make jh_build pass -source 1.5 by default to javadoc if
     no -source parameter is explicitly given.
+  * Make jh_build pass -target 1.5 by default to javac if
+    neither -source nor -target is explicitly given.
 
  -- Niels Thykier <niels at thykier.net>  Wed, 20 Jun 2012 18:56:47 +0200
 
diff --git a/jh_build b/jh_build
index f81404b..653d083 100755
--- a/jh_build
+++ b/jh_build
@@ -52,7 +52,11 @@ JH_JAVAC_OPTS="`getarg o javacopts`"
 JH_JAVADOC_OPTS="`getarg O javadoc-opts`"
 
 if ! grep -- -source <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+    if ! grep -- -target <<< "$JH_JAVAC_OPTS" &>/dev/null; then
+	JH_JAVAC_OPTS="-source 1.5 -target 1.5 $JH_JAVAC_OPTS"
+    else
 	JH_JAVAC_OPTS="-source 1.5 $JH_JAVAC_OPTS"
+    fi
 fi
 
 if ! grep -- -source <<< "$JH_JAVADOC_OPTS" &>/dev/null; then

-- 
UNNAMED PROJECT