Mercurial > hg > release > icedtea7-2.5
changeset 2720:f990f8b724ad
PR1814: HotSpot URL should be used with --enable-hg
2014-06-02 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1814: HotSpot URL should be used with --enable-hg
* Makefile.am:
(.PHONY): Add clean-download-hotspot.
(download); Depend on download-hotspot.
(clean-download): Move clean-download-nashorn
to clean-download-openjdk to retain ordering.
(download-openjdk): Remove hotspot from for loop
and HotSpot zip download rules.
(clean-download-openjdk): Depend on clean-download-hotspot.
(download-hotspot): New target. Cloning now uses HS_URL
as with zip downloading.
(clean-download-hotspot): Separated from clean-download-openjdk.
(extract-hotspot): Depend on download-hotspot.
* NEWS: Updated.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Thu, 05 Jun 2014 16:50:44 +0100 |
parents | 655014a92f22 |
children | 9755b09356f0 |
files | ChangeLog Makefile.am NEWS |
diffstat | 3 files changed, 64 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 05 16:50:10 2014 +0100 +++ b/ChangeLog Thu Jun 05 16:50:44 2014 +0100 @@ -1,5 +1,23 @@ 2014-06-02 Andrew John Hughes <gnu.andrew@member.fsf.org> + PR1814: HotSpot URL should be used with --enable-hg + * Makefile.am: + (.PHONY): Add clean-download-hotspot. + (download); Depend on download-hotspot. + (clean-download): Move clean-download-nashorn + to clean-download-openjdk to retain ordering. + (download-openjdk): Remove hotspot from for loop + and HotSpot zip download rules. + (clean-download-openjdk): Depend on clean-download-hotspot. + (download-hotspot): New target. Cloning now uses HS_URL + as with zip downloading. + (clean-download-hotspot): Separated from clean-download-openjdk. + (extract-hotspot): Depend on download-hotspot. + * NEWS: Updated. + +2014-06-02 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1365: Replace hgforest support * INSTALL: Remove documentation of --with-project as option is being removed.
--- a/Makefile.am Thu Jun 05 16:50:10 2014 +0100 +++ b/Makefile.am Thu Jun 05 16:50:44 2014 +0100 @@ -828,7 +828,8 @@ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \ clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \ clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \ - clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck + clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \ + clean-download-hotspot env: @echo 'unset JAVA_HOME' @@ -861,7 +862,7 @@ # Download OpenJDK sources. stamps/download.stamp: stamps/download-openjdk.stamp \ - stamps/download-cacao.stamp stamps/download-jamvm.stamp + stamps/download-cacao.stamp stamps/download-jamvm.stamp stamps/download-hotspot.stamp mkdir -p stamps touch $@ @@ -873,7 +874,7 @@ else if USE_HG $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL) openjdk; - for repos in corba jaxp jaxws langtools hotspot jdk ; do \ + for repos in corba jaxp jaxws langtools jdk ; do \ $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/$${repos} openjdk/$${repos}; \ done else @@ -991,32 +992,12 @@ echo "ERROR: No up-to-date OpenJDK langtools zip available"; exit -1; \ fi ; \ fi ; -if USE_ALT_HOTSPOT_SRC_ZIP - ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP) -endif - echo "Using HotSpot build: ${HSBUILD}" - if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then \ - if test "x$(enable_downloading)" = "xyes"; then \ - if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \ - mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \ - fi ; \ - $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ - if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ - | $(SHA256SUM) --check ; then \ - echo "ERROR: Bad download of HotSpot zip"; false; \ - fi; \ - else \ - echo "ERROR: No up-to-date OpenJDK HotSpot zip available"; exit -1; \ - fi ; \ - fi endif endif mkdir -p stamps touch $@ -clean-download-openjdk: +clean-download-openjdk: clean-download-hotspot if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ rm -f $(OPENJDK_SRC_ZIP) ; \ fi @@ -1035,9 +1016,6 @@ if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \ rm -f $(LANGTOOLS_SRC_ZIP) ; \ fi - if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \ - rm -f $(HOTSPOT_SRC_ZIP) ; \ - fi rm -f stamps/download-openjdk.stamp stamps/download-cacao.stamp: @@ -1103,6 +1081,43 @@ rm -f $(JAMVM_SRC_ZIP) rm -f stamps/download-jamvm.stamp +stamps/download-hotspot.stamp: stamps/download-openjdk.stamp +if OPENJDK_SRC_DIR_FOUND +else +if USE_HG + $(HG) clone $(REV_ARG) $(HS_URL) openjdk/hotspot +else +if USE_ALT_HOTSPOT_SRC_ZIP + ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP) +endif + echo "Using HotSpot build: ${HSBUILD}" + if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ + | $(SHA256SUM) --check ; \ + then \ + if test "x$(enable_downloading)" = "xyes"; then \ + if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \ + mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ + if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of HotSpot zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date OpenJDK HotSpot zip available"; exit -1; \ + fi ; \ + fi +endif +endif + mkdir -p stamps + touch $@ + +clean-download-hotspot: + if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \ + rm -f $(HOTSPOT_SRC_ZIP) ; \ + fi + rm -f stamps/download-hotspot.stamp + stamps/extract.stamp: stamps/extract-openjdk.stamp \ stamps/extract-cacao.stamp stamps/remove-intree-libraries.stamp \ stamps/extract-jamvm.stamp stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp @@ -1208,7 +1223,7 @@ rm -rf openjdk rm -f stamps/extract-openjdk.stamp -stamps/extract-hotspot.stamp: stamps/extract-openjdk.stamp +stamps/extract-hotspot.stamp: stamps/extract-openjdk.stamp stamps/download-hotspot.stamp set -e ; \ if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \ if test -e ${HOTSPOT_SRC_ZIP} ; \ @@ -2714,13 +2729,9 @@ download-cacao: stamps/download-cacao.stamp -download-jamvm: stamps/download-jamvm.stamp - -download-jaf-drop: stamps/download-jaf-drop.stamp +download-hotspot: stamps/download-hotspot.stamp -download-jaxp-drop: stamps/download-jaxp-drop.stamp - -download-jaxws-drop: stamps/download-jaxws-drop.stamp +download-jamvm: stamps/download-jamvm.stamp download-openjdk: stamps/download-openjdk.stamp
--- a/NEWS Thu Jun 05 16:50:10 2014 +0100 +++ b/NEWS Thu Jun 05 16:50:44 2014 +0100 @@ -278,6 +278,7 @@ - PR1765: Boot JDK on ppc64le uses differently named arch directory to final build - PR1807: Support Debian/Ubuntu 7 OpenJDK Install as Boot JDK - PR1365: Replace hgforest support + - PR1814: HotSpot URL should be used with --enable-hg * PPC & AIX port - Add AIX-specific build instructions to README-ppc.html - Added AIX as testing platform for more jtreg tests written in shell-script