/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset c3b3c0cb05d3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c3b3c0cb05d3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Sep 04 15:22:54 2014 +0100

	PR1348: Make versioning variables more obvious and name tarballs better.

	2013-09-10  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(BUILD_VERSION): Renamed from OPENJDK_VERSION.
		(COMBINED_VERSION): Use BUILD_VERSION.
		(ICEDTEA_ENV): Likewise.
		(dist-openjdk): Should really use COMBINED_VERSION.
		(dist-openjdk-fsg): Likewise.
		(dist-openjdk-fsg-tz): Additional target which
		makes an xz tarball instead of a zip (for Jiri ;)


changeset b27c53ea4272 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b27c53ea4272
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Sep 04 16:05:29 2014 +0100

	PR1348: Move version settings to OpenJDK configure from OpenJDK make.

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

		* Makefile.am:
		(ICEDTEA_CONFIGURE): Add update version,
		build number and milestone options.
		(ICEDTEA_ENV): Drop BUILD_NUMBER,
		JDK_UPDATE_VERSION, JRE_RELEASE_VERSION
		and MILESTONE, which appear to be no
		longer used.


diffstat:

 ChangeLog   |  21 +++++++++++++++++++++
 Makefile.am |  21 ++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r 3680c74438e9 -r b27c53ea4272 ChangeLog
--- a/ChangeLog	Wed Sep 03 16:32:44 2014 +0100
+++ b/ChangeLog	Thu Sep 04 16:05:29 2014 +0100
@@ -1,3 +1,24 @@
+2014-09-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_CONFIGURE): Add update version,
+	build number and milestone options.
+	(ICEDTEA_ENV): Drop BUILD_NUMBER,
+	JDK_UPDATE_VERSION, JRE_RELEASE_VERSION
+	and MILESTONE, which appear to be no
+	longer used.
+
+2013-09-10  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(BUILD_VERSION): Renamed from OPENJDK_VERSION.
+	(COMBINED_VERSION): Use BUILD_VERSION.
+	(ICEDTEA_ENV): Likewise.
+	(dist-openjdk): Should really use COMBINED_VERSION.
+	(dist-openjdk-fsg): Likewise.
+	(dist-openjdk-fsg-tz): Additional target which
+	makes an xz tarball instead of a zip (for Jiri ;)
+
 2014-09-03  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* NEWS: Add bug reference for system LCMS support.
diff -r 3680c74438e9 -r b27c53ea4272 Makefile.am
--- a/Makefile.am	Wed Sep 03 16:32:44 2014 +0100
+++ b/Makefile.am	Thu Sep 04 16:05:29 2014 +0100
@@ -1,8 +1,8 @@
 # Dependencies
 
-OPENJDK_VERSION = b23
 JDK_UPDATE_VERSION = 20
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
+BUILD_VERSION = b23
+COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
 CORBA_CHANGESET = 83ebbcc0dda5
 JAXP_CHANGESET = 888f90c5e7da
@@ -273,7 +273,10 @@
 	  --enable-unlimited-crypto \
 	  --with-cacerts-file=$(SYSTEM_JDK_DIR)/jre/lib/security/cacerts \
 	  --with-zlib=system --with-stdc++lib=dynamic \
-	  --with-boot-jdk=$(BOOT_DIR)
+	  --with-boot-jdk=$(BOOT_DIR) \
+	  --with-update-version=$(JDK_UPDATE_VERSION) \
+	  --with-build-number=$(BUILD_VERSION) \
+	  --with-milestone="fcs"
 
 if ENABLE_CACAO
 ICEDTEA_CONFIGURE += \
@@ -294,10 +297,6 @@
 endif
 
 ICEDTEA_ENV = \
-        BUILD_NUMBER="$(OPENJDK_VERSION)" \
-	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
-        JRE_RELEASE_VERSION="1.8.0_$(COMBINED_VERSION)" \
-	MILESTONE="fcs" \
 	LANG="C" \
 	PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
 	CLASSPATH="" \
@@ -553,11 +552,15 @@
 # Creates archive of openjdk.
 dist-openjdk: stamps/extract-cacao.stamp
 	find openjdk/ -name \\.hg* | xargs rm -rf	
-	$(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
+	$(ZIP) -r openjdk-$(COMBINED_VERSION) openjdk/
 
 # Creates archive of openjdk that is compliant with Free Software guidelines.
 dist-openjdk-fsg: stamps/patch-fsg.stamp
-	$(ZIP) -r openjdk-fsg-$(OPENJDK_VERSION) openjdk/
+	$(ZIP) -r openjdk-fsg-$(COMBINED_VERSION) openjdk/
+
+dist-openjdk-fsg-xz: stamps/patch-fsg.stamp
+	tardir=openjdk/ && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c \
+	  >openjdk-fsg-$(COMBINED_VERSION).tar.xz
 
 # OpenJDK Source Preparation Targets
 # ==================================