diff options
| author | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-22 16:57:17 +0000 |
|---|---|---|
| committer | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-22 17:05:16 +0000 |
| commit | 0ba0f207c6035d8edfbcce39d8150c36af551a00 (patch) | |
| tree | cff9cf8c8f813c8726400be7867c05769ecca4a1 /jdk8-build-release.yaml | |
| parent | d8baff222668c68313f5af508ad489c6b5693859 (diff) | |
jdk: Fix build-release directories and names
Make the src directory have a different name from the binaries
directory.
Change-Id: I2d10a6c4f928fa53773c37bd23ef51ff1bf96a39
Diffstat (limited to 'jdk8-build-release.yaml')
| -rw-r--r-- | jdk8-build-release.yaml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jdk8-build-release.yaml b/jdk8-build-release.yaml index ad200a28..ad05b27d 100644 --- a/jdk8-build-release.yaml +++ b/jdk8-build-release.yaml @@ -80,6 +80,7 @@ # Generate files names dependent on year/month. RELEASE=$(date +%y%m) JDKDIR=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} + JDK_SRCDIR=jdk8u-src-${RELEASE} ccache_build_opts=--disable-ccache @@ -91,8 +92,9 @@ mv jdk8u $JDKDIR # Tar up the source before sullying it with a build. - tar --exclude=.hg\* -acf out/jdk8u-src-${RELEASE}.tar.xz $JDKDIR + tar --exclude=.hg\* -acf out/jdk8u-src-${RELEASE}.tar.xz $JDK_SRCDIR + mv $JDK_SRCDIR $JDKDIR shopt -s nullglob # Extract boot jdk @@ -135,10 +137,10 @@ fi # Archive the result - artifact_name=jdk8u-${JVM_VARIANT}-${BUILD_TYPE} + artifact_name=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE} # This is different from ordinary builds. - tar -C build-stage2/images --exclude=\*.diz --transform="s!^j2sdk-image/!$artifact_name/!" -acf out/${artifact_name}.tar.xz j2sdk-image + tar -C build-stage2/images --exclude=\*.diz --transform="s!^j2sdk-image!$artifact_name!" -acf out/${artifact_name}.tar.xz j2sdk-image publishers: - archive: artifacts: 'out/*.tar.xz' |