/hg/release/icedtea7-2.5: PR2000: Obtain release version from co...

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Sep 22 16:14:23 UTC 2014 

changeset 34c6a0fa1764 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=34c6a0fa1764
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Sep 22 17:12:45 2014 +0100

	PR2000: Obtain release version from configure and use in URLs
	PR2002: Fix references to hotspot.map following PR2000

	Included in 2.5.3pre01 (previous commit):
	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
	PR2003: --disable-system-gtk option broken by refactoring in PR1736
	PR2009: Checksum of policy JAR files changes on every build
	S4963723: Implement SHA-224
	S7044060: Need to support NSA Suite B Cryptography algorithms
	S8006935: Need to take care of long secret keys in HMAC/PRF compuation

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

		* Makefile.am:
		(HS_TYPE): Fix hotspot.map path.
		(HS_URL): Likewise.
		(HS_CHANGESET): Likewise.
		(HS_SHA256SUM): Likewise.
		(EXTRA_DIST): Remove hotspot.map.
		hotspot.map.in is automatically added
		by autoconf.
		* NEWS: Updated.

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

		* hotspot.map: Moved to...
		* Makefile.am:
		(ICEDTEA_URL): Use $(ICEDTEA_RELEASE) to obtain
		release version.
		* 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.
		* hotspot.map.in: ... here so the URL can be
		generated using the release version.


diffstat:

 ChangeLog      |  27 +++++++++++++++++++++++++++
 Makefile.am    |  13 ++++++-------
 NEWS           |   2 ++
 acinclude.m4   |  11 +++++++++++
 configure.ac   |   3 +++
 hotspot.map    |   3 ---
 hotspot.map.in |   3 +++
 7 files changed, 52 insertions(+), 10 deletions(-)

diffs (125 lines):

diff -r f362ae34fe1b -r 34c6a0fa1764 ChangeLog
--- a/ChangeLog	Mon Sep 22 16:41:07 2014 +0100
+++ b/ChangeLog	Mon Sep 22 17:12:45 2014 +0100
@@ -1,3 +1,30 @@
+2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(HS_TYPE): Fix hotspot.map path.
+	(HS_URL): Likewise.
+	(HS_CHANGESET): Likewise.
+	(HS_SHA256SUM): Likewise.
+	(EXTRA_DIST): Remove hotspot.map.
+	hotspot.map.in is automatically added
+	by autoconf.
+	* NEWS: Updated.
+
+2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* hotspot.map: Moved to...
+	* Makefile.am:
+	(ICEDTEA_URL): Use $(ICEDTEA_RELEASE) to obtain
+	release version.
+	* 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.
+	* hotspot.map.in: ... here so the URL can be
+	generated using the release version.
+
 2014-09-22  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r f362ae34fe1b -r 34c6a0fa1764 Makefile.am
--- a/Makefile.am	Mon Sep 22 16:41:07 2014 +0100
+++ b/Makefile.am	Mon Sep 22 17:12:45 2014 +0100
@@ -36,12 +36,12 @@
 ICEDTEA_BRANCH = 2.5
 ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest-$(ICEDTEA_BRANCH)
 ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
-ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/2.5.3
+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`"
-HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
+HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
+HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
+HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 
 # Build directories
 
@@ -757,8 +757,7 @@
 	$(top_srcdir)/patches/hotspot/*/*.patch \
 	tools-copy contrib overlays \
 	jconsole.desktop policytool.desktop \
-	$(JTREG_SRCS) HACKING fsg.sh \
-	hotspot.map autogen.sh \
+	$(JTREG_SRCS) HACKING fsg.sh autogen.sh \
 	tapset/hotspot.stp.in \
 	tapset/hotspot_jni.stp.in \
 	tapset/jstack.stp.in \
diff -r f362ae34fe1b -r 34c6a0fa1764 NEWS
--- a/NEWS	Mon Sep 22 16:41:07 2014 +0100
+++ b/NEWS	Mon Sep 22 17:12:45 2014 +0100
@@ -22,6 +22,8 @@
   - 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
+  - PR2002: Fix references to hotspot.map following PR2000
   - PR2003: --disable-system-gtk option broken by refactoring in PR1736
   - PR2009: Checksum of policy JAR files changes on every build
 
diff -r f362ae34fe1b -r 34c6a0fa1764 acinclude.m4
--- a/acinclude.m4	Mon Sep 22 16:41:07 2014 +0100
+++ b/acinclude.m4	Mon Sep 22 17:12:45 2014 +0100
@@ -2808,6 +2808,17 @@
   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])
+])
+
+
 AC_DEFUN_ONCE([IT_ENABLE_INFINALITY],
 [
   AC_REQUIRE([IT_CHECK_FOR_FONTCONFIG])
diff -r f362ae34fe1b -r 34c6a0fa1764 configure.ac
--- a/configure.ac	Mon Sep 22 16:41:07 2014 +0100
+++ b/configure.ac	Mon Sep 22 17:12:45 2014 +0100
@@ -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 f362ae34fe1b -r 34c6a0fa1764 hotspot.map
--- a/hotspot.map	Mon Sep 22 16:41:07 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/2.5.3 9f719e4c80af 63b824ef5ffbf702838fbe2917ddfab563b271576871edf23101db265584e49d
-aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/2.5.1 a03843f2ff15 e88ca1ef9eeafa9bac7f0e5277a927129288547f241f0ed1e53969c6888177f2
diff -r f362ae34fe1b -r 34c6a0fa1764 hotspot.map.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot.map.in	Mon Sep 22 17:12:45 2014 +0100
@@ -0,0 +1,3 @@
+# version type(drop/hg) url changeset sha256sum
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 9f719e4c80af 63b824ef5ffbf702838fbe2917ddfab563b271576871edf23101db265584e49d
+aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/2.5.1 a03843f2ff15 e88ca1ef9eeafa9bac7f0e5277a927129288547f241f0ed1e53969c6888177f2

More information about the distro-pkg-dev mailing list