changeset 2383:e019c260e5e5

Use the IcedTea servers for the forest. 2011-05-04 Andrew John Hughes <ahughes@redhat.com> Move to using icedtea servers. * Makefile.am: (CORBA_SHA256SUM): Updated. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (ICEDTEA_PREFIX): Added to avoid hardcoding the prefix for the root directory. (ICEDTEA_HG_URL): Updated to use icedtea.classpath.org (extract-openjdk): Use $(ICEDTEA_PREFIX) in place of 'jdk7'.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 04 May 2011 19:59:30 +0100
parents 8fa7f2649c4c
children 5ffa85bf891c
files ChangeLog Makefile.am
diffstat 2 files changed, 27 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 04 08:46:05 2011 +0100
+++ b/ChangeLog	Wed May 04 19:59:30 2011 +0100
@@ -1,3 +1,20 @@
+2011-05-04  Andrew John Hughes  <ahughes@redhat.com>
+
+	Move to using icedtea servers.
+	* Makefile.am:
+	(CORBA_SHA256SUM): Updated.
+	(HOTSPOT_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PREFIX): Added to avoid hardcoding
+	the prefix for the root directory.
+	(ICEDTEA_HG_URL): Updated to use icedtea.classpath.org
+	(extract-openjdk): Use $(ICEDTEA_PREFIX) in
+	place of 'jdk7'.
+
 2011-05-03  Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/hotspot/default/gcc-suffix.patch,
--- a/Makefile.am	Wed May 04 08:46:05 2011 +0100
+++ b/Makefile.am	Wed May 04 19:59:30 2011 +0100
@@ -10,13 +10,13 @@
 LANGTOOLS_CHANGESET = 8e26c4aee63c
 OPENJDK_CHANGESET = d4aea1a51d62
 
-CORBA_SHA256SUM = 82eebaa8a248e18a4e4a0552716453c1f7877135ea73b51f3056fdec850267f9
-HOTSPOT_SHA256SUM = 3868c969833dc3b88523d711fc21cfc2c57fea5b6f387a7082aff5634b35c0a1
-JAXP_SHA256SUM = 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64
-JAXWS_SHA256SUM = 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230
-JDK_SHA256SUM = 7619cdfffd3dcba1275ab37546e89536ff93794ebd7022bf23c3123675cbf635
-LANGTOOLS_SHA256SUM = e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f
-OPENJDK_SHA256SUM = 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6
+CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac
+HOTSPOT_SHA256SUM = d939f29993a75c263b9b0bed8ccb74340860681ec8be1a62a76946ca9502255d
+JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0
+JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c
+JDK_SHA256SUM = b73bde3576c83439dcb141bc94a9257fe495dcbd1892bbf7700c8b1bcb51636e
+LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39
+OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d
 
 CACAO_VERSION = e321b101a9ee
 CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444
@@ -34,7 +34,8 @@
 JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip
 JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5
 
-ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
+ICEDTEA_PREFIX = icedtea7-forest
+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/
 CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
@@ -1086,7 +1087,7 @@
 	      *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \
 	      *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \
 	    esac; \
-	    mv jdk7-$(OPENJDK_CHANGESET) openjdk ; \
+	    mv $(ICEDTEA_PREFIX)-$(OPENJDK_CHANGESET) openjdk ; \
 	    if test "x${HSBUILD}" != "xdefault"; then \
 	      rm -rf openjdk/hotspot ; \
 	    fi ; \