Mercurial > hg > icedtea10
changeset 2568:f7e2e0904a87
PR2001: Synchronise HEAD tarball paths with release branch paths
2014-09-16 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR2001: Synchronise HEAD tarball paths with
release branch paths
* hotspot.map: Moved to...
* Makefile.am:
(ICEDTEA_URL): Include release in path to match
release branches.
* NEWS: Updated.
* acinclude.m4:
(IT_DETERMINE_VERSION): Obtain branch and release
version automatically from package version.
* configure.ac: Call IT_DETERMINE_VERSION and
generate hotspot.map.
* hotspot.map.in: ... here so the URL can be
generated using the release version.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 08 Jun 2015 05:40:53 +0100 |
| parents | 67795f64537e |
| children | 8c21507c2875 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac hotspot.map hotspot.map.in |
| diffstat | 7 files changed, 35 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 08 05:29:12 2015 +0100 +++ b/ChangeLog Mon Jun 08 05:40:53 2015 +0100 @@ -1,3 +1,20 @@ +2014-09-16 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR2001: Synchronise HEAD tarball paths with + release branch paths + * hotspot.map: Moved to... + * Makefile.am: + (ICEDTEA_URL): Include release in path to match + release branches. + * NEWS: Updated. + * acinclude.m4: + (IT_DETERMINE_VERSION): Obtain branch and release + version automatically from package version. + * configure.ac: Call IT_DETERMINE_VERSION and + generate hotspot.map. + * hotspot.map.in: ... here so the URL can be + generated using the release version. + 2015-05-24 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2383: Location of docs directory in
--- a/Makefile.am Mon Jun 08 05:29:12 2015 +0100 +++ b/Makefile.am Mon Jun 08 05:40:53 2015 +0100 @@ -42,7 +42,7 @@ ICEDTEA_MAJOR = icedtea8 ICEDTEA_PREFIX = $(ICEDTEA_MAJOR)-forest ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) -ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR) +ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(ICEDTEA_RELEASE) # Build directories
--- a/NEWS Mon Jun 08 05:29:12 2015 +0100 +++ b/NEWS Mon Jun 08 05:40:53 2015 +0100 @@ -61,6 +61,7 @@ - PR1980: Support using the system installation of giflib - PR1981: Support using the system installation of libpng - PR1994: make dist broken + - PR2001: Synchronise HEAD tarball paths with release branch paths - PR2199: Support giflib 5.1.0 - PR2212: DGifCloseFile call should check the return value, not the error code, for failure - PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
--- a/acinclude.m4 Mon Jun 08 05:29:12 2015 +0100 +++ b/acinclude.m4 Mon Jun 08 05:40:53 2015 +0100 @@ -1845,3 +1845,14 @@ AC_MSG_RESULT([$enable_jar_compression]) AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes") ]) + +AC_DEFUN_ONCE([IT_DETERMINE_VERSION], +[ + AC_MSG_CHECKING([which branch and release of IcedTea is being built]) + ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##') + ICEDTEA_BRANCH=$(echo ${ICEDTEA_RELEASE}|sed 's|\.[[0-9]]$||') + AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE}]) + AC_SUBST([ICEDTEA_RELEASE]) + AC_SUBST([ICEDTEA_BRANCH]) +]) +
--- a/configure.ac Mon Jun 08 05:29:12 2015 +0100 +++ b/configure.ac Mon Jun 08 05:40:53 2015 +0100 @@ -12,6 +12,9 @@ cd $abs_top_builddir AC_SUBST(abs_top_srcdir) +IT_DETERMINE_VERSION +AC_CONFIG_FILES([hotspot.map]) + AC_CANONICAL_HOST AC_PREFIX_DEFAULT([bootstrap])
--- a/hotspot.map Mon Jun 08 05:29:12 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# version url changeset md5sum -default drop http://icedtea.classpath.org/download/drops/icedtea8 85e5201a55e4 0fcf2f5f49ff4504fd095a57e767ea3c3eb8181e65d9e8b3f3accd3f03ff97b8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hotspot.map.in Mon Jun 08 05:40:53 2015 +0100 @@ -0,0 +1,2 @@ +# version url changeset md5sum +default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 85e5201a55e4 0fcf2f5f49ff4504fd095a57e767ea3c3eb8181e65d9e8b3f3accd3f03ff97b8