Mercurial > hg > release > icedtea-1.9
changeset 1417:df03b256c9e0
* Makefile.am (ICEDTEA_ENV): Set MILESTONE to fcs.
* patches/icedtea-version.patch: Remove special casing of
MILESTONE in hotspot build, add special casing of milestone in
langtools build.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Sat, 08 Nov 2008 21:25:47 +0100 |
| parents | 285c8111f751 |
| children | 93e7061da818 |
| files | ChangeLog Makefile.am patches/icedtea-version.patch |
| diffstat | 3 files changed, 23 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Nov 08 18:17:50 2008 +0100 +++ b/ChangeLog Sat Nov 08 21:25:47 2008 +0100 @@ -1,3 +1,10 @@ +2008-11-08 Mark Wielaard <mark@klomp.org> + + * Makefile.am (ICEDTEA_ENV): Set MILESTONE to fcs. + * patches/icedtea-version.patch: Remove special casing of + MILESTONE in hotspot build, add special casing of milestone in + langtools build. + 2008-11-08 Mark Wielaard <mark@klomp.org> * Makefile.am (OPENJDK_MD5SUM): Fixed value.
--- a/Makefile.am Sat Nov 08 18:17:50 2008 +0100 +++ b/Makefile.am Sat Nov 08 21:25:47 2008 +0100 @@ -140,6 +140,7 @@ "BUILD_NUMBER=$(OPENJDK_VERSION)" \ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \ "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \ + "MILESTONE=fcs" \ "LANG=C" \ "PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \ @@ -209,6 +210,7 @@ "BUILD_NUMBER=$(OPENJDK_VERSION)" \ "JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \ "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \ + "MILESTONE=fcs" \ "LANG=C" \ "PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
--- a/patches/icedtea-version.patch Sat Nov 08 18:17:50 2008 +0100 +++ b/patches/icedtea-version.patch Sat Nov 08 21:25:47 2008 +0100 @@ -12,20 +12,6 @@ PRODUCT_SUFFIX = Runtime Environment JDK_RC_PLATFORM_NAME = Platform COMPANY_NAME = N/A -@@ -260,12 +260,7 @@ - JDK_UNDERSCORE_VERSION = $(subst .,_,$(JDK_VERSION)) - JDK_MKTG_UNDERSCORE_VERSION = $(subst .,_,$(JDK_MKTG_VERSION)) - --# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set --ifneq ($(MILESTONE),fcs) -- RELEASE = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) --else -- RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE) --endif -+RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE) - - # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set - ifdef BUILD_NUMBER --- openjdk/hotspot/src/share/vm/utilities/vmError.cpp~ 2008-08-28 10:23:18.000000000 +0200 +++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp 2008-10-21 14:05:12.000000000 +0200 @@ -168,7 +168,8 @@ @@ -61,3 +47,17 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. CFLAGS += $(CFLAGS_WARN/BYFILE) +--- openjdk/langtools/make/Makefile.orig ++++ openjdk/langtools/make/Makefile +@@ -82,7 +82,11 @@ + endif + + ifdef MILESTONE ++ifneq ($(MILESTONE),fcs) + ANT_OPTIONS += -Dmilestone=$(MILESTONE) ++else ++ ANT_OPTIONS += -Drelease=$(JDK_VERSION) ++endif + endif + + ifdef BUILD_NUMBER