| 41 |
|
|
| 42 |
|
main() { |
| 43 |
|
[[ "$PWD" =~ /lib-src$ ]] || { echo Always run as ./build-jtreg; exit 1; } |
| 44 |
< |
TESTNG_VERSION="6.9.8" |
| 44 |
> |
TESTNG_VERSION="6.9.9" |
| 45 |
|
rm -rf "/tmp/testng-$TESTNG_VERSION"*; mkdir "/tmp/testng-$TESTNG_VERSION" |
| 46 |
|
def_make_dir TESTNG_HOME "/tmp/testng-$TESTNG_VERSION" |
| 47 |
|
|
| 59 |
|
|
| 60 |
|
download_maven_jar "junit" "junit" "4.10" |
| 61 |
|
download_maven_jar "org/testng" "testng" "$TESTNG_VERSION" |
| 62 |
< |
download_maven_jar "com/beust" "jcommander" "1.48" |
| 62 |
> |
download_maven_jar "com/beust" "jcommander" "1.72" |
| 63 |
|
|
| 64 |
+ |
# TODO: Upgrade to jtharness 5.x |
| 65 |
|
rm -rf jtharness-4.6; rm -f ./*jtharness*4.6* |
| 66 |
|
download_ubuntu "jtharness/jtharness_4.6-1.debian.tar.xz" |
| 67 |
|
download_ubuntu "jtharness/jtharness_4.6-1.dsc" |
| 111 |
|
def_make_file JAVATEST_JAR "$(find $EXTRACT/ -name javatest.jar)" |
| 112 |
|
def_make_file JAVAHELP_JAR "$(find $EXTRACT/ -name jh.jar)" |
| 113 |
|
|
| 114 |
+ |
hg_clone_codetools() { |
| 115 |
+ |
local -r repo="$1" rev="$2" |
| 116 |
+ |
rm -rf "$repo" |
| 117 |
+ |
hg clone -r "$rev" "http://hg.openjdk.java.net/code-tools/${repo}" |
| 118 |
+ |
rm -rf "${repo}/.hg" |
| 119 |
+ |
tar cJf "${repo}.tar.xz" "$repo" |
| 120 |
+ |
} |
| 121 |
+ |
|
| 122 |
|
# asmtools is optional, but let's build it for completeness. |
| 123 |
< |
# asmtools project doesn't seem to have releases; we'll grab tip. |
| 124 |
< |
# hg clone http://hg.openjdk.java.net/code-tools/asmtools |
| 125 |
< |
rm -rf "asmtools" "asmtools-"*"-build" |
| 117 |
< |
wget -qO- "http://hg.openjdk.java.net/code-tools/asmtools/archive/tip.tar.gz" > "asmtools.tar.gz" |
| 118 |
< |
tar xzf "asmtools.tar.gz" |
| 119 |
< |
mv "asmtools-"*[0-9a-f][0-9a-f][0-9a-f] "asmtools" |
| 120 |
< |
(cd asmtools/build && ant build) |
| 123 |
> |
hg_clone_codetools asmtools 7.0-b06 |
| 124 |
> |
rm -rf "asmtools-"*"-build" |
| 125 |
> |
(cd "asmtools/build" && ant build) |
| 126 |
|
def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release" |
| 127 |
|
|
| 128 |
< |
# hg clone http://hg.openjdk.java.net/code-tools/jtreg |
| 124 |
< |
def_make_var BUILD_NUMBER "b07" |
| 128 |
> |
def_make_var BUILD_NUMBER "b14" |
| 129 |
|
JTREG_REV="jtreg4.2-${BUILD_NUMBER}" |
| 130 |
< |
rm -rf "jtreg" "$JTREG_REV" "$JTREG_REV.tar.gz" |
| 127 |
< |
wget -q "http://hg.openjdk.java.net/code-tools/jtreg/archive/$JTREG_REV.tar.gz" |
| 128 |
< |
tar xzf "$JTREG_REV.tar.gz" |
| 129 |
< |
mv "jtreg-$JTREG_REV" "jtreg" |
| 130 |
> |
hg_clone_codetools jtreg "$JTREG_REV" |
| 131 |
|
|
| 132 |
|
def_make_dir JDK17HOME "$HOME/jdk/jdk7" |
| 133 |
|
def_make_dir JDK18HOME "$HOME/jdk/jdk8" |
| 139 |
|
|
| 140 |
|
cp jtreg/build/images/jtreg/lib/*.jar ../jsr166/lib/. |
| 141 |
|
|
| 142 |
< |
# Clean up intermediate artifacts |
| 142 |
> |
# As a side effect, save a general purpose jtreg "distribution". |
| 143 |
> |
rsync -a jtreg/build/images/jtreg/ "${JTREG_REV#jtreg}/" |
| 144 |
> |
|
| 145 |
> |
# Clean up intermediate artifacts. |
| 146 |
|
# asmtools creates a bogus index.html |
| 147 |
|
rm -rf asmtools asmtools-*-build index.html \ |
| 148 |
|
jtreg extract "${DOWNLOADED_MAVEN_JARS[@]}" \ |
