Mercurial > hg > release > icedtea7-2.0
changeset 2491:6f5766492517
Use the IcedTea7 2.0 forest.
2011-10-10 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(ICEDTEA_PREFIX): Change to use the 2.0
branch.
(OPENJDK_SHA256SUM): Updated due to change
in ICEDTEA_PREFIX.
(extract-openjdk): Handle Mercurial filtering
of '.' with '-' in directory names.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 10 Oct 2011 23:02:34 +0100 |
| parents | 199deef2195e |
| children | 9efe0319ef13 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 10 19:11:53 2011 +0100 +++ b/ChangeLog Mon Oct 10 23:02:34 2011 +0100 @@ -1,3 +1,13 @@ +2011-10-10 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (ICEDTEA_PREFIX): Change to use the 2.0 + branch. + (OPENJDK_SHA256SUM): Updated due to change + in ICEDTEA_PREFIX. + (extract-openjdk): Handle Mercurial filtering + of '.' with '-' in directory names. + 2011-10-10 Andrew John Hughes <ahughes@redhat.com> * NEWS: Cleanup.
--- a/Makefile.am Mon Oct 10 19:11:53 2011 +0100 +++ b/Makefile.am Mon Oct 10 23:02:34 2011 +0100 @@ -16,7 +16,7 @@ JAXWS_SHA256SUM = 6aace2cc9f1a98a3822733ad568cc070ec178ff3618c05229c68072af3ed4765 JDK_SHA256SUM = d8e9bb264f2a31424764466273f10c05d4247328ab4c08a0f4b8123993d78e65 LANGTOOLS_SHA256SUM = 03a256afc7371b3b0fbbbfd80a318e22984f6cbff26082948e8d5845ba193aee -OPENJDK_SHA256SUM = aa3b3cf17081cde2a4014e5dffec75f5b5402ad48f7f9943c32a2fa4544a8746 +OPENJDK_SHA256SUM = bb47d452a61ed154fad98fda35f93e6e0f3328632ef2cf0afa1d95cd6264071e CACAO_VERSION = d6264eb66506 CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c @@ -30,7 +30,7 @@ JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz -ICEDTEA_PREFIX = icedtea7-forest +ICEDTEA_PREFIX = icedtea7-forest-2.0 ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ @@ -1067,7 +1067,7 @@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ esac; \ - mv $(ICEDTEA_PREFIX)-$(OPENJDK_CHANGESET) openjdk ; \ + mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ else \ echo "ERROR: Couldn't extract OpenJDK"; \ false; \