Mercurial > hg > icedtea8
changeset 2914:cc947e4a6b37 icedtea-3.13.0pre01
PR3743: Support EA builds
2019-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3743: Support EA builds
* Makefile.am:
(ICEDTEA_CONFIGURE): Use @MAKEFILE@ rather
than hardcoded value.
* NEWS: Updated.
* acinclude.m4:
(IT_DETERMINE_VERSION): Define MILESTONE.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 17 Jul 2019 03:16:11 +0100 |
| parents | f73f4d605f45 |
| children | 708895aecf95 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 |
| diffstat | 4 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 25 21:04:45 2019 +0100 +++ b/ChangeLog Wed Jul 17 03:16:11 2019 +0100 @@ -1,3 +1,13 @@ +2019-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3743: Support EA builds + * Makefile.am: + (ICEDTEA_CONFIGURE): Use @MAKEFILE@ rather + than hardcoded value. + * NEWS: Updated. + * acinclude.m4: + (IT_DETERMINE_VERSION): Define MILESTONE. + 2019-05-25 Andrew John Hughes <gnu_andrew@member.fsf.org> Bump to icedtea-3.13.0pre01.
--- a/Makefile.am Sat May 25 21:04:45 2019 +0100 +++ b/Makefile.am Wed Jul 17 03:16:11 2019 +0100 @@ -463,7 +463,7 @@ --with-boot-jdk=$(BOOT_DIR) \ --with-update-version=@JDK_UPDATE_VERSION@ \ --with-build-number=@BUILD_VERSION@ \ - --with-milestone="fcs" \ + --with-milestone=@MILESTONE@ \ --with-vendor-name="${VENDOR_NAME}" \ --with-vendor-url="${VENDOR_URL}" \ --with-vendor-bug-url="${VENDOR_BUG_URL}" \
--- a/NEWS Sat May 25 21:04:45 2019 +0100 +++ b/NEWS Wed Jul 17 03:16:11 2019 +0100 @@ -12,6 +12,8 @@ New in release 3.13.0 (2019-07-XX): +* New features + - PR3743: Support EA builds * Import of OpenJDK 8 u222 build 01 - S8022879: TEST_BUG: sun/nio/cs/MalformedSurrogates.java fails intermittently - S8025209: Intermittent test failure java/net/Socket/asyncClose/AsyncClose.java
--- a/acinclude.m4 Sat May 25 21:04:45 2019 +0100 +++ b/acinclude.m4 Wed Jul 17 03:16:11 2019 +0100 @@ -2091,7 +2091,12 @@ JAVA_VENDOR=openjdk JDK_UPDATE_VERSION=222 BUILD_VERSION=b01 - COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION} + MILESTONE=ea + if test "x${MILESTONE}" = "xfcs"; then + COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION} + else + COMBINED_VERSION=${JDK_UPDATE_VERSION}-${MILESTONE}-${BUILD_VERSION} + fi OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION} ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##') ICEDTEA_BRANCH=$(echo ${ICEDTEA_RELEASE}|sed 's|\.[[0-9]]$||') @@ -2100,6 +2105,7 @@ AC_SUBST([JAVA_VENDOR]) AC_SUBST([JDK_UPDATE_VERSION]) AC_SUBST([BUILD_VERSION]) + AC_SUBST([MILESTONE]) AC_SUBST([COMBINED_VERSION]) AC_SUBST([OPENJDK_VER]) AC_SUBST([ICEDTEA_RELEASE])