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.2 by jsr166, Fri Jan 20 20:29:13 2017 UTC vs.
Revision 1.4 by jsr166, Sat Apr 15 01:58:32 2017 UTC

# Line 105 | Line 105 | main() {
105    def_make_file JAVATEST_JAR "$(find $EXTRACT/ -name javatest.jar)"
106    def_make_file JAVAHELP_JAR "$(find $EXTRACT/ -name jh.jar)"
107  
108 +  # asmtools is optional, but let's build it for completeness.
109 +  # asmtools project doesn't seem to have releases; we'll grab tip.
110 +  # hg clone http://hg.openjdk.java.net/code-tools/asmtools
111 +  rm -rf "asmtools" "asmtools-"*"-build"
112 +  wget -qO- "http://hg.openjdk.java.net/code-tools/asmtools/archive/tip.tar.gz" > "asmtools.tar.gz"
113 +  tar xzf "asmtools.tar.gz"
114 +  mv "asmtools-"*[0-9a-f][0-9a-f][0-9a-f] "asmtools"
115 +  (cd asmtools/build && ant build)
116 +  def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release"
117 +
118    # hg clone http://hg.openjdk.java.net/code-tools/jtreg
119 <  def_make_var BUILD_NUMBER "b05"
119 >  def_make_var BUILD_NUMBER "b07"
120    JTREG_REV="jtreg4.2-${BUILD_NUMBER}"
121    rm -rf "jtreg" "$JTREG_REV" "$JTREG_REV.tar.gz"
122    wget -q "http://hg.openjdk.java.net/code-tools/jtreg/archive/$JTREG_REV.tar.gz"
# Line 124 | Line 134 | main() {
134    cp jtreg/build/images/jtreg/lib/*.jar ../jsr166/lib/.
135  
136    # Clean up intermediate artifacts
137 <  rm -rf jtreg extract "${TMP_FILES[@]}" "$JTHARNESS_HOME" "$TESTNG_HOME"
137 >  # asmtools creates a bogus index.html
138 >  rm -rf asmtools asmtools-*-build index.html \
139 >    jtreg extract "${TMP_FILES[@]}" "$JTHARNESS_HOME" "$TESTNG_HOME"
140  
141    exit 0
142   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines