ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/lib-src/build-jtreg
(Generate patch)

Comparing lib-src/build-jtreg (file contents):
Revision 1.4 by jsr166, Sat Apr 15 01:58:32 2017 UTC vs.
Revision 1.5 by jsr166, Sun Aug 20 16:03:05 2017 UTC

# Line 5 | Line 5
5  
6   set -eux
7  
8 < declare -a MAKE_FLAGS=() TMP_FILES=()
8 > declare -a MAKE_FLAGS=() DOWNLOADED_MAVEN_JARS=()
9 >
10 > die() { printf "%s: $1\n" "$0" "${@:2}" >&2; exit 2; }
11  
12   def_make_var() {
13    typeset -n varref="$1"
# Line 14 | Line 16 | def_make_var() {
16   }
17  
18   def_make_file() {
19 <  [[ -f "$2" ]]
19 >  [[ -f "$2" ]] || die "%s: no such file" "$2"
20    def_make_var "$@"
21   }
22  
23   def_make_dir() {
24 <  [[ -d "$2" ]]
24 >  [[ -d "$2" ]] || die "%s: no such directory" "$2"
25    def_make_var "$@"
26   }
27  
28   download_ubuntu() {
29 <    local -r pkg="$1"
30 <    wget -q "http://us.archive.ubuntu.com/ubuntu/pool/universe/${pkg:0:1}/${pkg}"
29 >  local -r pkg="$1"
30 >  wget -q "http://us.archive.ubuntu.com/ubuntu/pool/universe/${pkg:0:1}/${pkg}"
31   }
32  
33   download_maven_jar() {
# Line 34 | Line 36 | download_maven_jar() {
36    wget -qO"/tmp/$jarfile" \
37      "http://search.maven.org/remotecontent?filepath=${groupId}/${artifactId}/${version}/${jarfile}"
38    def_make_file "${artifactId^^}_JAR" "/tmp/$jarfile"
39 <  TMP_FILES+=("/tmp/$jarfile")
39 >  DOWNLOADED_MAVEN_JARS+=("/tmp/$jarfile")
40   }
41  
42   main() {
# Line 43 | Line 45 | main() {
45    rm -rf "/tmp/testng-$TESTNG_VERSION"*; mkdir "/tmp/testng-$TESTNG_VERSION"
46    def_make_dir TESTNG_HOME "/tmp/testng-$TESTNG_VERSION"
47  
48 <  download_maven_jar "junit" "junit" "4.10"
49 <  download_maven_jar "org/testng" "testng" "$TESTNG_VERSION"
50 <  download_maven_jar "com/beust" "jcommander" "1.48"
49 <
48 >  # Download a mostly unused testng distribution, because jtreg's
49 >  # makefiles want both TESTNG_JAR and TESTNG_HOME.
50 >  # https://github.com/cbeust/testng/releases
51    rm -rf "/tmp/${TESTNG_VERSION}.tar.gz" "/tmp/${TESTNG_VERSION}"
52    wget -qO"/tmp/testng-${TESTNG_VERSION}.tar.gz" \
53      "https://github.com/cbeust/testng/archive/${TESTNG_VERSION}.tar.gz"
# Line 56 | Line 57 | main() {
57      rm -f "/tmp/testng-${TESTNG_VERSION}.tar.gz"
58    )
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"
63 +
64    rm -rf jtharness-4.6; rm -f ./*jtharness*4.6*
65    download_ubuntu "jtharness/jtharness_4.6-1.debian.tar.xz"
66    download_ubuntu "jtharness/jtharness_4.6-1.dsc"
# Line 136 | Line 141 | main() {
141    # Clean up intermediate artifacts
142    # asmtools creates a bogus index.html
143    rm -rf asmtools asmtools-*-build index.html \
144 <    jtreg extract "${TMP_FILES[@]}" "$JTHARNESS_HOME" "$TESTNG_HOME"
144 >    jtreg extract "${DOWNLOADED_MAVEN_JARS[@]}" \
145 >    "$JTHARNESS_HOME" "$TESTNG_HOME"
146  
147    exit 0
148   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines