changeset 2269:057f66ea35f5

Bump to latest revision of hs19 (b09). 2010-11-02 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (replace-hotspot): Don't hardcode 'master' as the top-level directory, extract it from the url. * hotspot.map: Move to latest hs19 (currently only on baseline tree)
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 03 Nov 2010 10:52:50 +0000
parents 69b7e0c0a5c3
children 5a6f16947db2
files ChangeLog Makefile.am hotspot.map
diffstat 3 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 18 12:36:39 2010 -0400
+++ b/ChangeLog	Wed Nov 03 10:52:50 2010 +0000
@@ -1,3 +1,12 @@
+2010-11-02  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(replace-hotspot): Don't hardcode 'master'
+	as the top-level directory, extract it
+	from the url.
+	* hotspot.map: Move to latest hs19 (currently
+	only on baseline tree)
+
 2010-10-18  Omair Majid  <omajid@redhat.com>
 
 	* netx/net/sourceforge/jnlp/security/VariableX509TrustManager.java:
--- a/Makefile.am	Mon Oct 18 12:36:39 2010 -0400
+++ b/Makefile.am	Wed Nov 03 10:52:50 2010 +0000
@@ -884,8 +884,10 @@
 	  if test -e ${HOTSPOT_SRC_ZIP} ; \
 	  then \
 	    $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
-	    chmod -R ug+w master-* ; \
-	    mv master-$$($(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \
+	    dir=$$($(AWK) 'version==$$1 {print gensub(/.*\/([^/]*)$$/,"\\1","g",$$2)}' \
+	      version=hs19 $(abs_top_srcdir)/hotspot.map) ; \
+	    chmod -R ug+w $$dir-* ; \
+	    mv $$dir-$$($(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) \
 	      $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \
 	  fi ; \
 	fi ;
--- a/hotspot.map	Mon Oct 18 12:36:39 2010 -0400
+++ b/hotspot.map	Wed Nov 03 10:52:50 2010 +0000
@@ -1,2 +1,2 @@
 # version url changeset md5sum
-hs19 http://hg.openjdk.java.net/hsx/hsx19/master 0803c0f69b51 f174d20d004c5e1ad08929895dbee21c
+hs19 http://hg.openjdk.java.net/hsx/hsx19/baseline 13edc857b967 f174d20d004c5e1ad08929895dbee21c