[jtreg] 03/04: Dropped the JTREG_HOME variable from the launcher scripts

[Emmanuel Bourg]

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

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

commit b5eda3700c8915bde678595c4970f4da61c7922e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 4 16:35:00 2014 +0200

    Dropped the JTREG_HOME variable from the launcher scripts
---
 debian/changelog               |  2 ++
 debian/patches/launchers.patch | 55 ++++++++++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10ebb83..040990e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 jtreg (4.1-b09-1) UNRELEASED; urgency=medium
 
+  * Team upload.
   * New upstream release
     - Refreshed the patches
   * Moved the package to Git
+  * Dropped the JTREG_HOME variable from the launcher scripts
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 17 Jun 2014 16:16:28 +0200
 
diff --git a/debian/patches/launchers.patch b/debian/patches/launchers.patch
index 89291f7..04b1642 100644
--- a/debian/patches/launchers.patch
+++ b/debian/patches/launchers.patch
@@ -3,7 +3,15 @@
 ## Bug: bug URL
 --- a/src/share/bin/jtdiff.sh
 +++ b/src/share/bin/jtdiff.sh
-@@ -37,40 +37,6 @@
+@@ -29,48 +29,11 @@
+ #
+ # jtdiff requires a version of Java equivalent to JDK 1.5.0 or higher.
+ 
+-# $JT_HOME can be used to specify the jtdiff installation directory
+-#   (e.g. /usr/local/java/jct-tools/3.2.2)
+-#
+ # $JT_JAVA is used to specify the version of java to use when running JavaTest
+ #   (e.g. /usr/local/java/jdk1.5.0/solaris-sparc/bin/java)
  #
  # jtdiff also provides an Ant task for direct invocation from Ant.
  
@@ -44,7 +52,7 @@
  # Separate out -J* options for the JVM
  # Unset IFS and use newline as arg separator to preserve spaces in args
  DUALCASE=1  # for MKS: make case statement case-sensitive (6709498)
-@@ -88,36 +54,25 @@
+@@ -88,36 +51,20 @@
  done
  unset DUALCASE
  
@@ -57,11 +65,8 @@
 -    JT_JAVA="$JAVA_HOME/bin/java"
 -else
 -    JT_JAVA=java
-+# Java home directory
-+if [ -z "${JT_JAVA}" ]; then
-+    JT_JAVA="/usr/lib/jvm/default-java"
- fi
- 
+-fi
+-
 -# Verify java version (1.)5 or newer used to run jtdiff
 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 |
 -        grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'`
@@ -72,14 +77,14 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtdiff"
 -    exit 1;
-+if [ -z "${JTREG_HOME}" ]; then
-+    JT_HOME="/usr/share/java"
++# Java home directory
++if [ -z "${JT_JAVA}" ]; then
++    JT_JAVA="/usr/lib/jvm/default-java"
  fi
  
-+
  # And finally ...
  
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="/usr/share/java/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  
@@ -93,7 +98,17 @@
      $jtdiffOpts
 --- a/src/share/bin/jtreg.sh
 +++ b/src/share/bin/jtreg.sh
-@@ -48,40 +48,6 @@
+@@ -36,9 +36,6 @@
+ #
+ # jtreg requires a version of Java equivalent to JDK 1.5.0 or higher.
+ 
+-# $JT_HOME can be used to specify the jtreg installation directory
+-#   (e.g. /usr/local/java/jct-tools/3.2.2)
+-#
+ # $JT_JAVA is used to specify the version of java to use when running JavaTest
+ #   (e.g. /usr/local/java/jdk1.5.0/solaris-sparc/bin/java)
+ #
+@@ -48,40 +45,6 @@
  # jtreg also provides Ant tasks; see the online help for details.
  # E.g.  jtreg -onlineHelp ant
  
@@ -134,7 +149,7 @@
  # Separate out -J* options for the JVM
  # Note jdk as possible default to run jtreg
  # Unset IFS and use newline as arg separator to preserve spaces in args
-@@ -102,37 +68,24 @@
+@@ -102,37 +65,20 @@
  done
  unset DUALCASE
  
@@ -149,11 +164,8 @@
 -    JT_JAVA="$jdk/bin/java"
 -else
 -    JT_JAVA=java
-+# Java home directory
-+if [ -z "${JT_JAVA}" ]; then
-+    JT_JAVA="/usr/lib/jvm/default-java"
- fi
- 
+-fi
+-
 -# Verify java version (1.)5 or newer used to run jtreg
 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 |
 -        grep 'java.version=' | sed -e 's/^.*=//' -e 's/^1\.//' -e 's/\([1-9][0-9]*\).*/\1/'`
@@ -164,13 +176,14 @@
 -elif [ "$version" -lt 5 ]; then
 -    echo "java version 5 or later is required to run jtreg"
 -    exit 1;
-+if [ -z "${JTREG_HOME}" ]; then
-+    JT_HOME="/usr/share/java"
++# Java home directory
++if [ -z "${JT_JAVA}" ]; then
++    JT_JAVA="/usr/lib/jvm/default-java"
  fi
  
  # And finally ...
  
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++JT_CLASSPATH="/usr/share/java/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
 +
  IFS=$nl
  

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