Mercurial > hg > release > icedtea8-3.0
changeset 2519:b27c53ea4272
PR1348: Move version settings to OpenJDK configure from OpenJDK make.
2014-09-04 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(ICEDTEA_CONFIGURE): Add update version,
build number and milestone options.
(ICEDTEA_ENV): Drop BUILD_NUMBER,
JDK_UPDATE_VERSION, JRE_RELEASE_VERSION
and MILESTONE, which appear to be no
longer used.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 04 Sep 2014 16:05:29 +0100 |
| parents | c3b3c0cb05d3 |
| children | ecb919dbfe35 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 04 15:22:54 2014 +0100 +++ b/ChangeLog Thu Sep 04 16:05:29 2014 +0100 @@ -1,3 +1,13 @@ +2014-09-04 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (ICEDTEA_CONFIGURE): Add update version, + build number and milestone options. + (ICEDTEA_ENV): Drop BUILD_NUMBER, + JDK_UPDATE_VERSION, JRE_RELEASE_VERSION + and MILESTONE, which appear to be no + longer used. + 2013-09-10 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Thu Sep 04 15:22:54 2014 +0100 +++ b/Makefile.am Thu Sep 04 16:05:29 2014 +0100 @@ -273,7 +273,10 @@ --enable-unlimited-crypto \ --with-cacerts-file=$(SYSTEM_JDK_DIR)/jre/lib/security/cacerts \ --with-zlib=system --with-stdc++lib=dynamic \ - --with-boot-jdk=$(BOOT_DIR) + --with-boot-jdk=$(BOOT_DIR) \ + --with-update-version=$(JDK_UPDATE_VERSION) \ + --with-build-number=$(BUILD_VERSION) \ + --with-milestone="fcs" if ENABLE_CACAO ICEDTEA_CONFIGURE += \ @@ -294,10 +297,6 @@ endif ICEDTEA_ENV = \ - BUILD_NUMBER="$(BUILD_VERSION)" \ - JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ - JRE_RELEASE_VERSION="1.8.0_$(COMBINED_VERSION)" \ - MILESTONE="fcs" \ LANG="C" \ PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \ CLASSPATH="" \