diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2017-01-12 16:16:30 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2017-01-12 16:18:54 +0000 |
| commit | 1cd85e5505dc058e04bced77b3d13e87c9b9feec (patch) | |
| tree | 71172016b52aa997768298c442c307ff16527b3a /jtreg-build.yaml | |
| parent | 18416fa635d9557b5ff4a2bb138578407b1d991a (diff) | |
jdk: Specify location of asmtools correctly
Pass location of asmtools on command line, rather than in envvar.
asmtools.jar will then be included in the jtreg package.
Change-Id: Ic90c740fa018000f3464914414fb397af15cb9b7
Diffstat (limited to 'jtreg-build.yaml')
| -rw-r--r-- | jtreg-build.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/jtreg-build.yaml b/jtreg-build.yaml index 5881ff88..f5feb141 100644 --- a/jtreg-build.yaml +++ b/jtreg-build.yaml @@ -55,13 +55,12 @@ # Build asmtools for jtreg. cd asmtools - ant -f build/build.xml -DbuildArea.dir=$PWD/out jar - - # Tell jtreg build where to get asmtools - export ASMTOOLS_HOME=$WORKSPACE/asmtools/out/lib/asmtools.jar + ant -f build/build.xml -DbuildArea.dir=$PWD/out cd ../jtreg + unzip -o ../asmtools-6.0-build/dist/asmtools-6.0.zip + if [ ! -d jh2.0 ]; then # no longer available from http://download.java.net/javadesktop/javahelp/javahelp2_0_05.zip # 7bd68b82a1d5d8714856f661bd4d71a3 https://github.com/glub/secureftp/raw/master/contrib/javahelp2_0_05.zip @@ -124,6 +123,8 @@ -Djavahelp.home=./jh2.0 \ -Djhall.jar=./jh2.0/javahelp/lib/jhall.jar \ -Djh.jar=./jh2.0/javahelp/lib/jh.jar \ + -Dasmtools.home=./asmtools-6.0 \ + -Dasmtools.jar=./asmtools-6.0/lib/asmtools.jar \ -Dbuild.version=$BUILD_VERSION \ -Dbuild.number=$BUILD_NUMBER |