Mercurial > hg > release > icedtea7-2.1
changeset 2503:ab2e1d6184e0
Use 02 (for u2) as the update version.
2012-10-08 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Move JDK_UPDATE_VERSION and COMBINED_VERSION
to top of file with OPENJDK_VERSION.
(JDK_UPDATE_VERSION): Set to 02 for u2.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 08 Feb 2012 18:34:22 +0000 |
| parents | 5d5cf3cb4d46 |
| children | ea914bacafad |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 08 17:22:49 2012 +0000 +++ b/ChangeLog Wed Feb 08 18:34:22 2012 +0000 @@ -1,6 +1,13 @@ 2012-10-08 Andrew John Hughes <ahughes@redhat.com> - * Makefile.am, + * Makefile.am: + Move JDK_UPDATE_VERSION and COMBINED_VERSION + to top of file with OPENJDK_VERSION. + (JDK_UPDATE_VERSION): Set to 02 for u2. + +2012-10-08 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: (CORBA_CHANGESET): Updated. (HOTSPOT_CHANGESET): Likewise. (JAXP_CHANGESET): Likewise.
--- a/Makefile.am Wed Feb 08 17:22:49 2012 +0000 +++ b/Makefile.am Wed Feb 08 18:34:22 2012 +0000 @@ -1,6 +1,8 @@ # Dependencies OPENJDK_VERSION = b147 +JDK_UPDATE_VERSION = 02 +COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) CORBA_CHANGESET = 78cd4b4fcb75 HOTSPOT_CHANGESET = 7bcec32b0c9a @@ -374,9 +376,6 @@ ICEDTEA_SHARK_BUILD = true endif -JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//") -COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) - ICEDTEA_NAME = IcedTea7 if HAS_ICEDTEA_REVISION ICEDTEA_REV = +${ICEDTEA_REVISION}