Mercurial > hg > release > icedtea7-2.6
changeset 3001:301e94c92b33
PR3746: Support EA builds
2019-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3746: Support EA builds
* Makefile.am:
(ICEDTEA_ENV): 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 | Thu, 18 Jul 2019 01:32:33 +0100 |
| parents | 3b183ba4a3a3 |
| children | 9659bd900f82 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 |
| diffstat | 4 files changed, 20 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 17 20:05:23 2019 +0100 +++ b/ChangeLog Thu Jul 18 01:32:33 2019 +0100 @@ -1,3 +1,13 @@ +2019-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3746: Support EA builds + * Makefile.am: + (ICEDTEA_ENV): Use @MAKEFILE@ rather + than hardcoded value. + * NEWS: Updated. + * acinclude.m4: + (IT_DETERMINE_VERSION): Define MILESTONE. + 2019-07-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3744: Latest ISO 4217 amendments make
--- a/Makefile.am Wed Jul 17 20:05:23 2019 +0100 +++ b/Makefile.am Thu Jul 18 01:32:33 2019 +0100 @@ -583,7 +583,7 @@ BUILD_NUMBER="@BUILD_VERSION@" \ JDK_UPDATE_VERSION="@JDK_UPDATE_VERSION@" \ JRE_RELEASE_VERSION="@JAVA_VER@_@COMBINED_VERSION@" \ - MILESTONE="fcs" \ + MILESTONE="@MILESTONE@" \ LANG="C" \ PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \ ALT_BOOTDIR="$(BOOT_DIR)" \
--- a/NEWS Wed Jul 17 20:05:23 2019 +0100 +++ b/NEWS Thu Jul 18 01:32:33 2019 +0100 @@ -31,6 +31,8 @@ - S8220517: Enhanced GIF support - S8221518, CVE-2019-2816: Normalize normalization - S8223511, CVE-2019-2842: Extended AES support +* New features + - PR3746: Support EA builds * Import of OpenJDK 7 u231 build 1 - S7152169: TEST_BUG: sun/security/tools/jarsigner/ec.sh occasionally fail due to keytool error on sparc - S7194075: Various classes of sunec.jar are duplicated in rt.jar
--- a/acinclude.m4 Wed Jul 17 20:05:23 2019 +0100 +++ b/acinclude.m4 Thu Jul 18 01:32:33 2019 +0100 @@ -2950,7 +2950,12 @@ JAVA_VENDOR=openjdk JDK_UPDATE_VERSION=231 BUILD_VERSION=b01 - COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION} + MILESTONE=fcs + 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]]$||') @@ -2959,6 +2964,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])