Mercurial > hg > release > icedtea7-2.5
changeset 2668:d561879ac19c
Make versioning variables more obvious and name tarballs better.
2013-09-10 Andrew John Hughes <gnu.andrew@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 ;)
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 20 Sep 2013 14:22:34 +0100 |
| parents | 41bf342bdb3e |
| children | 45fd9fd91644 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 20 14:20:07 2013 +0100 +++ b/ChangeLog Fri Sep 20 14:22:34 2013 +0100 @@ -1,3 +1,14 @@ +2013-09-10 Andrew John Hughes <gnu.andrew@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 ;) + 2013-09-09 Andrew John Hughes <gnu.andrew@redhat.com> * acinclude.m4:
--- a/Makefile.am Fri Sep 20 14:20:07 2013 +0100 +++ b/Makefile.am Fri Sep 20 14:22:34 2013 +0100 @@ -1,8 +1,8 @@ # Dependencies -OPENJDK_VERSION = b00 JDK_UPDATE_VERSION = 60 -COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION) +BUILD_VERSION = b00 +COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) CORBA_CHANGESET = e5da8ecaf6f9 JAXP_CHANGESET = fc76c585e6c5 @@ -433,7 +433,7 @@ ICEDTEA_ENV = \ ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \ ANT="$(ANT)" \ - BUILD_NUMBER="$(OPENJDK_VERSION)" \ + BUILD_NUMBER="$(BUILD_VERSION)" \ JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \ MILESTONE="fcs" \ @@ -858,11 +858,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 # ==================================