/hg/icedtea7: PR2000: Synchronise HEAD tarball paths with releas...

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Sep 16 22:39:53 UTC 2014 

changeset 45cfef3d9a3a in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=45cfef3d9a3a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Sep 16 23:38:31 2014 +0100

	PR2000: Synchronise HEAD tarball paths with release branch paths

	2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* hotspot.map: Moved to...
		* Makefile.am:
		(ICEDTEA_URL): Include release in path to match
		release branches.
		* NEWS: Updated.
		* acinclude.m4:
		(IT_DETERMINE_VERSION): Obtain branch and release
		version automatically from package version.
		* configure.ac: Call IT_DETERMINE_VERSION and
		generate hotspot.map. Add a trailing zero to the
		first release (2.6.0 instead of 2.6).
		* hotspot.map.in: ... here so the URL can be
		generated using the release version.


diffstat:

 ChangeLog      |  16 ++++++++++++++++
 Makefile.am    |   2 +-
 NEWS           |   1 +
 acinclude.m4   |  11 +++++++++++
 configure.ac   |   5 ++++-
 hotspot.map    |   3 ---
 hotspot.map.in |   3 +++
 7 files changed, 36 insertions(+), 5 deletions(-)

diffs (97 lines):

diff -r d93bc33e8bd5 -r 45cfef3d9a3a ChangeLog
--- a/ChangeLog	Sat Sep 13 16:37:31 2014 +0100
+++ b/ChangeLog	Tue Sep 16 23:38:31 2014 +0100
@@ -1,3 +1,19 @@
+2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* hotspot.map: Moved to...
+	* Makefile.am:
+	(ICEDTEA_URL): Include release in path to match
+	release branches.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Obtain branch and release
+	version automatically from package version.
+	* configure.ac: Call IT_DETERMINE_VERSION and
+	generate hotspot.map. Add a trailing zero to the
+	first release (2.6.0 instead of 2.6).
+	* hotspot.map.in: ... here so the URL can be
+	generated using the release version.
+
 2014-09-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* Makefile.am,
diff -r d93bc33e8bd5 -r 45cfef3d9a3a Makefile.am
--- a/Makefile.am	Sat Sep 13 16:37:31 2014 +0100
+++ b/Makefile.am	Tue Sep 16 23:38:31 2014 +0100
@@ -35,7 +35,7 @@
 ICEDTEA_MAJOR = icedtea7
 ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest
 ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
-ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)
+ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(ICEDTEA_RELEASE)
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
diff -r d93bc33e8bd5 -r 45cfef3d9a3a NEWS
--- a/NEWS	Sat Sep 13 16:37:31 2014 +0100
+++ b/NEWS	Tue Sep 16 23:38:31 2014 +0100
@@ -200,6 +200,7 @@
   - PR1988: C++ Interpreter should no longer be used on ppc64
   - PR1989: Make jdk_generic_profile.sh handle missing programs better and be more verbose
   - PR1992, RH735336: Support retrieving proxy settings on GNOME 3.12.2
+  - PR2000: Synchronise HEAD tarball paths with release branch paths
 
 New in release 2.5.2 (2014-08-29):
 
diff -r d93bc33e8bd5 -r 45cfef3d9a3a acinclude.m4
--- a/acinclude.m4	Sat Sep 13 16:37:31 2014 +0100
+++ b/acinclude.m4	Tue Sep 16 23:38:31 2014 +0100
@@ -2835,3 +2835,14 @@
   esac
   AC_MSG_RESULT([$has_native_hotspot_port])
 ])
+
+AC_DEFUN_ONCE([IT_DETERMINE_VERSION],
+[
+  AC_MSG_CHECKING([which branch and release of IcedTea is being built])
+  ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')
+  ICEDTEA_BRANCH=$(echo ${ICEDTEA_RELEASE}|sed 's|\.[[0-9]]$||')
+  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE}])
+  AC_SUBST([ICEDTEA_RELEASE])
+  AC_SUBST([ICEDTEA_BRANCH])
+])
+
diff -r d93bc33e8bd5 -r 45cfef3d9a3a configure.ac
--- a/configure.ac	Sat Sep 13 16:37:31 2014 +0100
+++ b/configure.ac	Tue Sep 16 23:38:31 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6pre08], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.0pre08], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -12,6 +12,9 @@
 cd $abs_top_builddir
 AC_SUBST(abs_top_srcdir)
 
+IT_DETERMINE_VERSION
+AC_CONFIG_FILES([hotspot.map])
+
 AC_CANONICAL_HOST
 
 AC_PREFIX_DEFAULT([bootstrap])
diff -r d93bc33e8bd5 -r 45cfef3d9a3a hotspot.map
--- a/hotspot.map	Sat Sep 13 16:37:31 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7 6d5ec408f4ca 569f1529b900fc52435da4aa2f06f5697fe61459ed2962fc39a21e392d431206
-aarch64 hg http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
diff -r d93bc33e8bd5 -r 45cfef3d9a3a hotspot.map.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot.map.in	Tue Sep 16 23:38:31 2014 +0100
@@ -0,0 +1,3 @@
+# version type(drop/hg) url changeset sha256sum
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 6d5ec408f4ca 569f1529b900fc52435da4aa2f06f5697fe61459ed2962fc39a21e392d431206
+aarch64 hg http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c

More information about the distro-pkg-dev mailing list