diff options
| author | Vladimir Tsanev | 2018-12-28 16:45:27 +0200 |
|---|---|---|
| committer | Vladimir Tsanev | 2018-12-28 16:45:27 +0200 |
| commit | 7a69401066296de1ae4fd3ca4faa4ffd4f2b5ba3 (patch) | |
| tree | 82b689705e2e3428923e458cbe412dfc325e6fc0 | |
| parent | 6bcd1562b46b8a70c9b47f1b19fe7145ab2b048e (diff) | |
| download | aur-7a69401066296de1ae4fd3ca4faa4ffd4f2b5ba3.tar.gz | |
upgrade to jg6.0-b04
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | jtharness.patch | 18 |
3 files changed, 29 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = jtharness pkgdesc = general purpose, fully-featured, flexible, and configurable test harness very well suited for most types of unit testing - pkgver = 6.0_b03 + pkgver = 6.0_b04 pkgrel = 2 url = https://wiki.openjdk.java.net/display/CodeTools/JT+Harness arch = any @@ -11,8 +11,10 @@ pkgbase = jtharness makedepends = java-asm depends = java-runtime>=7 optdepends = junit - source = http://hg.openjdk.java.net/code-tools/jtharness/archive/jt6.0-b03.tar.gz - sha256sums = d75778026b2b1edb72f123285ca3ef467aec45e3dea4b2b2316f71b072e38c79 + source = http://hg.openjdk.java.net/code-tools/jtharness/archive/jt6.0-b04.tar.gz + source = jtharness.patch + sha256sums = acabdb1ac97644619087351e3aab3292e99c95d08833af239e21fb1a01895a3e + sha256sums = 9ec405ec5c1dc1f545aa60a374aa8fa2abe9152489ace9f266b44f8ab95b0265 pkgname = jtharness @@ -2,7 +2,7 @@ pkgname=jtharness _version=6.0 -_build=b03 +_build=b04 pkgver=${_version}_${_build} pkgrel=2 pkgdesc="general purpose, fully-featured, flexible, and configurable test harness very well suited for most types of unit testing" @@ -19,20 +19,19 @@ conflicts=() install= _tag=jt${_version}-${_build} source=("http://hg.openjdk.java.net/code-tools/jtharness/archive/${_tag}.tar.gz" -# "${pkgname}.patch" + "${pkgname}.patch" ) -sha256sums=('d75778026b2b1edb72f123285ca3ef467aec45e3dea4b2b2316f71b072e38c79') +sha256sums=('acabdb1ac97644619087351e3aab3292e99c95d08833af239e21fb1a01895a3e' + '9ec405ec5c1dc1f545aa60a374aa8fa2abe9152489ace9f266b44f8ab95b0265') _jtdir=${pkgname}-jt${_version}-${_build} prepare() { cd ${srcdir}/${_jtdir} -# patch -p1 -i "${srcdir}/${pkgname}.patch" + patch -p1 -i "${srcdir}/${pkgname}.patch" + JAVA_HOME=/usr/lib/jvm/java-8-openjdk ant -f build/build.xml clean } build() { cd ${srcdir}/${_jtdir} - ln -sf /usr/share/java/junit.jar build/junit-4.10.jar - ln -sf /usr/share/java/asm/asm.jar build/asm6.jar - ln -sf /usr/share/java/asm/asm-commons.jar build/asm-commons6.jar JAVA_HOME=/usr/lib/jvm/java-8-openjdk ant -f build/build.xml } @@ -50,4 +49,3 @@ package() { mkdir $pkgdir/usr/share/${pkgname} ln -sf /usr/share/java/${pkgname} $pkgdir/usr/share/${pkgname}/lib } - diff --git a/jtharness.patch b/jtharness.patch new file mode 100644 index 000000000000..1682193204f4 --- /dev/null +++ b/jtharness.patch @@ -0,0 +1,18 @@ +diff -r d629cdcdba43 build/local.properties +--- a/build/local.properties Sun Oct 28 12:25:21 2018 +0000 ++++ b/build/local.properties Fri Dec 28 16:40:32 2018 +0200 +@@ -32,11 +32,11 @@ + servletjar = servlet-api.jar + + # bytecode library +-asmjar = asm6.jar +-asmcommonsjar = asm-commons6.jar ++asmjar = /usr/share/java/asm/asm.jar ++asmcommonsjar = /usr/share/java/asm/asm-commons.jar + + # JUnit Library - Version 4 currently used to compile 3 and 4 support +-junitlib = junit-4.10.jar ++junitlib = /usr/share/java/junit.jar + + # Please specify location where the build distribution (output) will be created + BUILD_DIR = ../JTHarness-build |