Mercurial > hg > icedtea9
changeset 2521:c3b3c0cb05d3
PR1348: 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 | Thu, 04 Sep 2014 15:22:54 +0100 |
| parents | 3680c74438e9 |
| children | b27c53ea4272 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 03 16:32:44 2014 +0100 +++ b/ChangeLog Thu Sep 04 15:22:54 2014 +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 ;) + 2014-09-03 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Add bug reference for system LCMS support.
--- a/Makefile.am Wed Sep 03 16:32:44 2014 +0100 +++ b/Makefile.am Thu Sep 04 15:22:54 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 @@ -294,7 +294,7 @@ endif ICEDTEA_ENV = \ - BUILD_NUMBER="$(OPENJDK_VERSION)" \ + BUILD_NUMBER="$(BUILD_VERSION)" \ JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \ JRE_RELEASE_VERSION="1.8.0_$(COMBINED_VERSION)" \ MILESTONE="fcs" \ @@ -553,11 +553,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 # ==================================