[pkg-java] r17979 - in trunk/jtreg/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Apr 4 13:18:17 UTC 2014
Author: ebourg-guest
Date: 2014-04-04 13:18:17 +0000 (Fri, 04 Apr 2014)
New Revision: 17979
Removed:
trunk/jtreg/debian/patches/dependencies.patch
Modified:
trunk/jtreg/debian/changelog
trunk/jtreg/debian/control
trunk/jtreg/debian/patches/launchers.patch
trunk/jtreg/debian/patches/series
trunk/jtreg/debian/rules
Log:
New upstream release (4.1-b08)
Refreshed launchers.patch
New build dependency on testng
Replaced dependencies.patch with command line arguments
Modified: trunk/jtreg/debian/changelog
===================================================================
--- trunk/jtreg/debian/changelog 2014-04-04 11:24:26 UTC (rev 17978)
+++ trunk/jtreg/debian/changelog 2014-04-04 13:18:17 UTC (rev 17979)
@@ -1,6 +1,10 @@
-jtreg (4.1-3) UNRELEASED; urgency=medium
+jtreg (4.1-b08-1) unstable; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed launchers.patch
+ - New build dependency on testng
+ * Replaced dependencies.patch with command line arguments
* Updated debian/watch and debian/orig-tar.sh to fetch the latest tagged
build from the upsteam Mercurial repository.
* debian/control:
@@ -10,7 +14,7 @@
* Switch to debhelper level 9
* debian/copyright: Updated the Format URI
- -- Emmanuel Bourg <ebourg at apache.org> Fri, 04 Apr 2014 12:56:14 +0200
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 04 Apr 2014 15:17:42 +0200
jtreg (4.1-2) unstable; urgency=low
Modified: trunk/jtreg/debian/control
===================================================================
--- trunk/jtreg/debian/control 2014-04-04 11:24:26 UTC (rev 17978)
+++ trunk/jtreg/debian/control 2014-04-04 13:18:17 UTC (rev 17979)
@@ -8,7 +8,8 @@
libjtharness-java,
ant,
javahelp2,
- libxalan2-java
+ libxalan2-java,
+ testng
Standards-Version: 3.9.5
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jtreg
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jtreg
Deleted: trunk/jtreg/debian/patches/dependencies.patch
===================================================================
--- trunk/jtreg/debian/patches/dependencies.patch 2014-04-04 11:24:26 UTC (rev 17978)
+++ trunk/jtreg/debian/patches/dependencies.patch 2014-04-04 13:18:17 UTC (rev 17979)
@@ -1,48 +0,0 @@
-## Description: Locate dependencies to /usr/share/java
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
-Index: jtreg-4.1/make/build.properties
-===================================================================
---- jtreg-4.1.orig/make/build.properties 2011-06-20 09:54:18.362805148 -0500
-+++ jtreg-4.1/make/build.properties 2011-06-20 09:56:54.486805175 -0500
-@@ -26,29 +26,29 @@
- # set locations here, or in ${root}/build.properties, or set on the
- # ant command line
-
--jtreg.build.resources = /w/jjg/work/jtreg
-+jtreg.build.resources = /usr/share/java
- # FIXME
-
- # JTHarness or JavaTest (should be should be 4.1.3 or better)
- #javatest.home = /w/jjg/work/os-jtreg/jtharness-4_1_2-MR1-Rel-b07/JTHarness-build/binaries/
--javatest.home = ${jtreg.build.resources}/jtharness-4_1_3-MR1-Rel-b08/JTHarness-build/binaries/
--javatest.jar = ${javatest.home}/lib/javatest.jar
-+javatest.home = ${jtreg.build.resources}
-+javatest.jar = ${javatest.home}/javatest.jar
- # the following is only true for older versions of JavaTest.
- # can't use <available> to set it automatically for some reason
- #javatest.includes.javahelp.ok = true
-
- # JavaHelp (should be version 2.0 or better)
--javahelp.home = ${jtreg.build.resources}/javahelp/javahelp_nbproject/dist
--jhall.jar = ${javahelp.home}/lib/jhall.jar
--jh.jar = ${javahelp.home}/lib/jh.jar
-+javahelp.home = ${jtreg.build.resources}
-+jhall.jar = ${javahelp.home}/jhall.jar
-+jh.jar = ${javahelp.home}/jh.jar
-
- # JUnit (should be 4.5 or better)
--junit.jar = ${jtreg.build.resources}/junit-4.5.jar
-+junit.jar = ${jtreg.build.resources}/junit4.jar
-
- # Ant ((should be version 1.6.5 or better)
- #ant.home =
--ant.jar = /usr/share/java/ant.jar
-+ant.jar = ${jtreg.build.resources}/ant.jar
-
--build.version = 4.0
--build.milestone = dev
--build.number = b00
-+build.version = 4.1
-+build.milestone = src
-+build.number = b02
Modified: trunk/jtreg/debian/patches/launchers.patch
===================================================================
--- trunk/jtreg/debian/patches/launchers.patch 2014-04-04 11:24:26 UTC (rev 17978)
+++ trunk/jtreg/debian/patches/launchers.patch 2014-04-04 13:18:17 UTC (rev 17979)
@@ -1,16 +1,19 @@
## Description: add some description
## Origin/Author: add some origin or author
## Bug: bug URL
-Index: jtreg-4.1/src/share/bin/jtdiff.sh
-===================================================================
---- jtreg-4.1.orig/src/share/bin/jtdiff.sh 2011-07-02 07:12:29.290992102 -0500
-+++ jtreg-4.1/src/share/bin/jtdiff.sh 2011-07-02 07:13:22.678992112 -0500
-@@ -38,32 +38,25 @@
- #
+--- a/src/share/bin/jtdiff.sh
++++ b/src/share/bin/jtdiff.sh
+@@ -37,40 +37,6 @@
+ #
# jtdiff also provides an Ant task for direct invocation from Ant.
-# Determine jtdiff/JavaTest installation directory
--if [ -z "$JT_HOME" ]; then
+-if [ -n "$JT_HOME" ]; then
+- if [ ! -r $JT_HOME/lib/jtreg.jar ];then
+- echo "Invalid JT_HOME=$JT_HOME. Cannot find or read $JT_HOME/lib/jtreg.jar"
+- exit 1;
+- fi
+-else
- # Deduce where script is installed
- # - should work on most derivatives of Bourne shell, like ash, bash, ksh,
- # sh, zsh, etc, including on Windows, MKS (ksh) and Cygwin (ash or bash)
@@ -20,7 +23,7 @@
- myname=`type "$0" | sed -e 's/^.* is a tracked alias for //' -e 's/^.* is //'`
- elif whence whence 1>/dev/null 2>&1 ; then
- myname=`whence "$0"`
-- fi
+- fi
- mydir=`dirname "$myname"`
- p=`cd "$mydir" ; pwd`
- while [ -n "$p" -a "$p" != "/" ]; do
@@ -30,78 +33,74 @@
- if [ -z "$JT_HOME" ]; then
- echo "Cannot determine JT_HOME; please set it explicitly"; exit 1
- fi
-- case "`uname -s`" in
-- CYGWIN* ) JT_HOME=`cygpath -m "$JT_HOME"` ;;
-- esac
-+# Java home directory
-+if [ -z "${JAVA_HOME}" ]; then
-+ JAVA_HOME="/usr/lib/jvm/default-java"
-+fi
-+
-+# Directory where jtreg is
-+if [ -z "${JTREG_HOME}" ]; then
-+ JTREG_HOME="/usr/share/java"
- fi
-
-+# Directory where jtharness is
-+if [ -z "${JTHAR_HOME}" ]; then
-+ JTHAR_HOME="/usr/share/java"
-+fi
-+
-+# Directory where other JAR are
-+if [ -z "${JAR_HOME}" ]; then
-+ JAR_HOME="/usr/share/java"
-+fi
-
+-fi
+-
+-# Normalize JT_HOME if using Cygwin
+-case "`uname -s`" in
+- CYGWIN* ) cygwin=1 ; JT_HOME=`cygpath -a -m "$JT_HOME"` ;;
+-esac
+-
+-
# Separate out -J* options for the JVM
# Unset IFS and use newline as arg separator to preserve spaces in args
-@@ -81,19 +74,13 @@
+ DUALCASE=1 # for MKS: make case statement case-sensitive (6709498)
+@@ -88,36 +54,20 @@
done
unset DUALCASE
-# Determine java for jtdiff, from JT_JAVA, JAVA_HOME, java
-if [ -n "$JT_JAVA" ]; then
-- if [ -d "$JT_JAVA" ]; then
-- JT_JAVA="$JT_JAVA/bin/java"
+- if [ -d "$JT_JAVA" ]; then
+- JT_JAVA="$JT_JAVA/bin/java"
- fi
--elif [ -n "$JAVA_HOME" ]; then
+-elif [ -n "$JAVA_HOME" ]; then
- JT_JAVA="$JAVA_HOME/bin/java"
-else
- JT_JAVA=java
-fi
-+# Determine java for jtdiff, JAVA_HOME, java
-+JT_JAVA="${JAVA_HOME}/bin/java"
-+# Determine class path
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar"
+-
+-# 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/'`
+-
+-if [ -z "$version" ]; then
+- echo "Cannot determine version of java to run jtdiff"
+- exit 1;
+-elif [ "$version" -lt 5 ]; then
+- echo "java version 5 or later is required to run jtdiff"
+- exit 1;
++# Directory where jtreg is
++if [ -z "${JTREG_HOME}" ]; then
++ JTREG_HOME="/usr/share/java"
+ 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 |
-+version=`"${JT_JAVA}" -classpath "${JT_CLASSPATH}" 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/'`
+ # And finally ...
- if [ -z "$version" ]; then
-@@ -108,9 +95,9 @@
-
++JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++
IFS=$nl
-"${JT_JAVA:-${JAVA_HOME:+$JAVA_HOME/bin/}java}" \
-+"${JT_JAVA}" \
++/usr/bin/java \
$javaOpts \
-Dprogram=`basename "$0"` \
- -cp "${JT_HOME}/lib/jtreg.jar" \
+ -cp "${JT_CLASSPATH}" \
com.sun.javatest.diff.Main \
$jtdiffOpts
-Index: jtreg-4.1/src/share/bin/jtreg.sh
-===================================================================
---- jtreg-4.1.orig/src/share/bin/jtreg.sh 2011-07-02 07:12:29.270992102 -0500
-+++ jtreg-4.1/src/share/bin/jtreg.sh 2011-07-02 07:13:49.818992118 -0500
-@@ -57,32 +57,25 @@
+--- a/src/share/bin/jtreg.sh
++++ b/src/share/bin/jtreg.sh
+@@ -48,40 +48,6 @@
# jtreg also provides Ant tasks; see the online help for details.
# E.g. jtreg -onlineHelp ant
-# Determine jtreg/JavaTest installation directory
--if [ -z "$JT_HOME" ]; then
+-if [ -n "$JT_HOME" ]; then
+- if [ ! -r $JT_HOME/lib/jtreg.jar ];then
+- echo "Invalid JT_HOME=$JT_HOME. Cannot find or read $JT_HOME/lib/jtreg.jar"
+- exit 1;
+- fi
+-else
- # Deduce where script is installed
- # - should work on most derivatives of Bourne shell, like ash, bash, ksh,
- # sh, zsh, etc, including on Windows, MKS (ksh) and Cygwin (ash or bash)
@@ -111,7 +110,7 @@
- myname=`type "$0" | sed -e 's/^.* is a tracked alias for //' -e 's/^.* is //'`
- elif whence whence 1>/dev/null 2>&1 ; then
- myname=`whence "$0"`
-- fi
+- fi
- mydir=`dirname "$myname"`
- p=`cd "$mydir" ; pwd`
- while [ -n "$p" -a "$p" != "/" ]; do
@@ -121,60 +120,57 @@
- if [ -z "$JT_HOME" ]; then
- echo "Cannot determine JT_HOME; please set it explicitly"; exit 1
- fi
-- case "`uname -s`" in
-- CYGWIN* ) JT_HOME=`cygpath -m "$JT_HOME"` ;;
-- esac
-+# Java home directory
-+if [ -z "${JAVA_HOME}" ]; then
-+ JAVA_HOME="/usr/lib/jvm/default-java"
-+fi
-+
-+# Directory where jtreg is
-+if [ -z "${JTREG_HOME}" ]; then
-+ JTREG_HOME="/usr/share/java"
- fi
-
-+# Directory where jtharness is
-+if [ -z "${JTHAR_HOME}" ]; then
-+ JTHAR_HOME="/usr/share/java"
-+fi
-+
-+# Directory where other JAR are
-+if [ -z "${JAR_HOME}" ]; then
-+ JAR_HOME="/usr/share/java"
-+fi
-
+-fi
+-
+-# Normalize JT_HOME if using Cygwin
+-case "`uname -s`" in
+- CYGWIN* ) cygwin=1 ; JT_HOME=`cygpath -a -m "$JT_HOME"` ;;
+-esac
+-
+-
# Separate out -J* options for the JVM
# Note jdk as possible default to run jtreg
-@@ -103,21 +96,13 @@
+ # Unset IFS and use newline as arg separator to preserve spaces in args
+@@ -102,37 +68,20 @@
done
unset DUALCASE
--# Determine java for jtreg, from JT_JAVA, JAVA_HOME, jdk, java
+-# Determine java for jtreg, from JT_JAVA, JAVA_HOME, -jdk, java
-if [ -n "$JT_JAVA" ]; then
-- if [ -d "$JT_JAVA" ]; then
-- JT_JAVA="$JT_JAVA/bin/java"
+- if [ -d "$JT_JAVA" ]; then
+- JT_JAVA="$JT_JAVA/bin/java"
- fi
--elif [ -n "$JAVA_HOME" ]; then
+-elif [ -n "$JAVA_HOME" ]; then
- JT_JAVA="$JAVA_HOME/bin/java"
-elif [ -n "$jdk" ]; then
- JT_JAVA="$jdk/bin/java"
-else
- JT_JAVA=java
-fi
-+# Determine java for jtdiff, JAVA_HOME, java
-+JT_JAVA="${JAVA_HOME}/bin/java"
-+# Determine class path
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar"
+-
+-# 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/'`
+-
+-if [ -z "$version" ]; then
+- echo "Cannot determine version of java to run jtreg"
+- exit 1;
+-elif [ "$version" -lt 5 ]; then
+- echo "java version 5 or later is required to run jtreg"
+- exit 1;
++# Directory where jtreg is
++if [ -z "${JTREG_HOME}" ]; then
++ JTREG_HOME="/usr/share/java"
+ 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 |
-+version=`"$JT_JAVA" -classpath "${JT_CLASSPATH}" 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/'`
+ # And finally ...
- if [ -z "$version" ]; then
-@@ -135,5 +120,6 @@
- "${JT_JAVA}" \
++JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:/usr/share/java/javatest.jar:/usr/share/java/jh.jar:/usr/share/java/junit4.jar"
++
+ IFS=$nl
+
+-"${JT_JAVA}" \
++/usr/bin/java \
$javaOpts \
-Dprogram=`basename "$0"` \
- -jar "${JT_HOME}/lib/jtreg.jar" \
Modified: trunk/jtreg/debian/patches/series
===================================================================
--- trunk/jtreg/debian/patches/series 2014-04-04 11:24:26 UTC (rev 17978)
+++ trunk/jtreg/debian/patches/series 2014-04-04 13:18:17 UTC (rev 17979)
@@ -1,2 +1 @@
-dependencies.patch
launchers.patch
Modified: trunk/jtreg/debian/rules
===================================================================
--- trunk/jtreg/debian/rules 2014-04-04 11:24:26 UTC (rev 17978)
+++ trunk/jtreg/debian/rules 2014-04-04 13:18:17 UTC (rev 17979)
@@ -3,13 +3,23 @@
JAVA_HOME = /usr/lib/jvm/default-java
override_dh_auto_build:
- ant -f make/build.xml
+ ant -f make/build.xml \
+ -Dant.jar=/usr/share/java/ant.jar \
+ -Djtreg.build.resources=/usr/share/java \
+ -Djh.jar=/usr/share/java/jh.jar \
+ -Djhall.jar=/usr/share/java/jhall.jar \
+ -Djunit.jar=/usr/share/java/junit4.jar \
+ -Dtestng.jar=/usr/share/java/testng.jar \
+ -Djavatest.jar=/usr/share/java/javatest.jar \
+ -Dbuild.version=4.1 \
+ -Dbuild.milestone=src \
+ -Dbuild.number=b08
dh_auto_build
- JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" \
- --help-option="-help" ./dist/jtreg/linux/bin/jtdiff > jtdiff.1
- JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" \
- --help-option="-help" ./dist/jtreg/linux/bin/jtreg > jtreg.1
+ # Generate the manpages
+ JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtdiff > jtdiff.1
+ JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtreg > jtreg.1
+
override_dh_auto_clean:
rm -rf dist
rm -rf build
More information about the pkg-java-commits
mailing list