Mercurial > hg > release > icedtea7-2.5

changeset 2732:15b1fc0169cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1848: Removal of project support leaves trailing '-' in version 2014-06-13 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1848: Removal of project support leaves trailing '-' in version * Makefile.am: (versioning): Drop use of PROJECT_NAME removed in PR1365. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 13 Jun 2014 23:06:24 +0100
parents 47947856cc3e
children 81ffee9f8143
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 13 23:03:30 2014 +0100
+++ b/ChangeLog	Fri Jun 13 23:06:24 2014 +0100
@@ -1,3 +1,12 @@
+2014-06-13  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1848: Removal of project support leaves
+	trailing '-' in version
+	* Makefile.am:
+	(versioning): Drop use of PROJECT_NAME removed
+	in PR1365.
+	* NEWS: Updated.
+
 2014-06-13  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	Update aarch64 port to jdk7u60_b04_aarch64_832
--- a/Makefile.am	Fri Jun 13 23:03:30 2014 +0100
+++ b/Makefile.am	Fri Jun 13 23:06:24 2014 +0100
@@ -1465,13 +1465,10 @@
 	  echo "DISTRO_PACKAGE_VERSION=$(PKGVERSION)" \
 	    >>openjdk/jdk/make/common/shared/Defs.gmk ;
 endif
-	if test x"$(PROJECT_NAME)" != "xjdk7" && test x"$(PROJECT_NAME)" != "xicedtea"; then \
-	  proj_suffix="-$(PROJECT_NAME)"; \
-	fi ; \
 	if test x"$(VERSION_SUFFIX)" != "x"; then \
 	  ver_suffix="-$(VERSION_SUFFIX)"; \
 	fi ; \
-	$(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
+	$(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${ver_suffix}#" \
 	  openjdk/jdk/make/common/shared/Defs.gmk;
 	mkdir -p stamps
 	touch $@
--- a/NEWS	Fri Jun 13 23:03:30 2014 +0100
+++ b/NEWS	Fri Jun 13 23:06:24 2014 +0100
@@ -290,6 +290,7 @@
   - PR1839, G478960: Provide Infinality Support via fontconfig
   - PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops
   - PR1843: Fail early if there is no native HotSpot JIT & all other options are disabled
+  - PR1848: Removal of project support leaves trailing '-' in version
 * PPC & AIX port
   - Add AIX-specific build instructions to README-ppc.html
   - Added AIX as testing platform for more jtreg tests written in shell-script