Mercurial > hg > icedtea8

changeset 2850:03cdd2506cad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3624: Sync desktop files with Fedora/RHEL versions again 2018-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3624: Sync desktop files with Fedora/RHEL versions again * Makefile.am: (JDK_UPDATE_VERSION): Moved to acinclude.m4. (BUILD_VERSION): Likewise. (COMBINED_VERSION): Likewise. (ICEDTEA_CONFIGURE): Use substitution for JDK_UPDATE_VERSION and BUILD_VERSION. (dist-openjdk): Use substitution for COMBINED_VERSION. (dist-openjdk-fsg): Likewise. (dist-openjdk-fsg-xz): Likewise. (install-data-local): Include JAVA_VENDOR in icon name. (uninstall-local): Likewise. * NEWS: Updated. * acinclude.m4: (IT_DETERMINE_VERSION): Define JAVA_VENDOR, JDK_UPDATE_VERSION, BUILD_VERSION, COMBINED_VERSION and OPENJDK_VER here. Include OPENJDK_VER in output. * jconsole.desktop.in: Add full version and target architecture to name to distinguish between multiple installations for the same major Java version. Add JAVA_VENDOR ('openjdk') to the icon name. * policytool.desktop.in: Likewise.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 17 Sep 2018 19:35:08 +0100
parents 8ea016a9714f
children 1a7d5095cb45
files ChangeLog Makefile.am NEWS acinclude.m4 jconsole.desktop.in policytool.desktop.in
diffstat 6 files changed, 54 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Sep 13 14:11:53 2018 +0100
+++ b/ChangeLog	Mon Sep 17 19:35:08 2018 +0100
@@ -1,3 +1,32 @@
+2018-09-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3624: Sync desktop files with Fedora/RHEL
+	versions again
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Moved to acinclude.m4.
+	(BUILD_VERSION): Likewise.
+	(COMBINED_VERSION): Likewise.
+	(ICEDTEA_CONFIGURE): Use substitution for
+	JDK_UPDATE_VERSION and BUILD_VERSION.
+	(dist-openjdk): Use substitution for
+	COMBINED_VERSION.
+	(dist-openjdk-fsg): Likewise.
+	(dist-openjdk-fsg-xz): Likewise.
+	(install-data-local): Include JAVA_VENDOR
+	in icon name.
+	(uninstall-local): Likewise.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Define JAVA_VENDOR,
+	JDK_UPDATE_VERSION, BUILD_VERSION, COMBINED_VERSION
+	and OPENJDK_VER here. Include OPENJDK_VER in output.
+	* jconsole.desktop.in:
+	Add full version and target architecture to name
+	to distinguish between multiple installations for the
+	same major Java version.  Add JAVA_VENDOR ('openjdk')
+	to the icon name.
+	* policytool.desktop.in: Likewise.
+
 2018-09-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump default HotSpot build to include PR3626
--- a/Makefile.am	Thu Sep 13 14:11:53 2018 +0100
+++ b/Makefile.am	Mon Sep 17 19:35:08 2018 +0100
@@ -1,9 +1,5 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 181
-BUILD_VERSION = b13
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-
 CORBA_CHANGESET = c120c4fb7b31
 JAXP_CHANGESET = 55420c5cc9f3
 JAXWS_CHANGESET = f824de94c42e
@@ -485,8 +481,8 @@
 	  --enable-unlimited-crypto \
 	  --with-stdc++lib=dynamic \
 	  --with-boot-jdk=$(BOOT_DIR) \
-	  --with-update-version=$(JDK_UPDATE_VERSION) \
-	  --with-build-number=$(BUILD_VERSION) \
+	  --with-update-version=@JDK_UPDATE_VERSION@ \
+	  --with-build-number=@BUILD_VERSION@ \
 	  --with-milestone="fcs" \
 	  --with-extra-cflags="$(CFLAGS)" \
 	  --with-extra-cxxflags="$(CXXFLAGS)" \
@@ -912,18 +908,18 @@
 	  echo "ERROR: zip not found"; exit 1; \
 	fi
 	find openjdk/ -name \\.hg* | xargs rm -rf	
-	$(ZIP) -r openjdk-$(COMBINED_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
 	if test "x${ZIP}" = "x"; then \
 	  echo "ERROR: zip not found"; exit 1; \
 	fi
-	$(ZIP) -r openjdk-fsg-$(COMBINED_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-fsg-@COMBINED_VERSION@.tar.xz
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -3213,7 +3209,7 @@
 	for sizes in 16 24 32 48 ; do \
 	  ${mkinstalldirs} $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
 	  ${INSTALL_DATA} openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon$${sizes}.png \
-	    $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-@JAVA_VER@.png ; \
+	    $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-@JAVA_VER@-@JAVA_VENDOR@.png ; \
 	done
 	for files in $(DESKTOP_FILES) ; do \
 	  ${INSTALL_DATA} $(builddir)/$${files} $(DESTDIR)$(datadir)/applications ; \
@@ -3357,7 +3353,7 @@
 	rm -rf $(DESTDIR)$(docdir)/THIRD_PARTY_README
 	rm -rf $(DESTDIR)$(docdir)/TRADEMARK
 	for sizes in 16 24 32 48 ; do \
-	  rm -vf $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-@JAVA_VER@.png; \
+	  rm -vf $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-@JAVA_VER@-@JAVA_VENDOR@.png; \
 	done
 	for files in $(DESKTOP_FILES) ; do \
 	  rm -vf $(DESTDIR)$(datadir)/applications/$$(basename $${files}); \
--- a/NEWS	Thu Sep 13 14:11:53 2018 +0100
+++ b/NEWS	Mon Sep 17 19:35:08 2018 +0100
@@ -20,6 +20,9 @@
   - S8199547, CVE-2018-2952: Exception to Pattern Syntax
   - S8200666, CVE-2018-2973: Improve LDAP support
   - PR3607, CVE-2018-3639: hw: cpu: speculative store bypass mitigation
+* New features
+  - PR3623: Allow Shenandoah to be used on all architectures
+  - PR3624: Sync desktop files with Fedora/RHEL versions again
 * Import of OpenJDK 8 u172 build 11
   - S8031304: Add dcmd to print all loaded dynamic libraries.
   - S8044107: Add Diagnostic Command to list all ClassLoaders
@@ -100,7 +103,6 @@
   - PR3597: Potential bogus -Wformat-overflow warning with -Wformat enabled
   - PR3600: jni_util.c does not import header file which declares getLastErrorString
   - PR3601: Fix additional -Wreturn-type issues introduced by 8061651
-  - PR3623: Allow Shenandoah to be used on all architectures
 * AArch64 port
   - S8207345, PR3626: Trampoline generation code reads from uninitialized memory
 * Shenandoah
--- a/acinclude.m4	Thu Sep 13 14:11:53 2018 +0100
+++ b/acinclude.m4	Mon Sep 17 19:35:08 2018 +0100
@@ -2075,10 +2075,20 @@
 [
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.8.0
+  JAVA_VENDOR=openjdk
+  JDK_UPDATE_VERSION=181
+  BUILD_VERSION=b13
+  COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}
+  OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
   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} for OpenJDK ${JAVA_VER}])
+  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${OPENJDK_VER}])
   AC_SUBST([JAVA_VER])
+  AC_SUBST([JAVA_VENDOR])
+  AC_SUBST([JDK_UPDATE_VERSION])
+  AC_SUBST([BUILD_VERSION])
+  AC_SUBST([COMBINED_VERSION])
+  AC_SUBST([OPENJDK_VER])
   AC_SUBST([ICEDTEA_RELEASE])
   AC_SUBST([ICEDTEA_BRANCH])
 ])
--- a/jconsole.desktop.in	Thu Sep 13 14:11:53 2018 +0100
+++ b/jconsole.desktop.in	Mon Sep 17 19:35:08 2018 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console
 Comment=Monitor and manage OpenJDK applications
 Exec=_BINDIR_/jconsole
-Icon=java-@JAVA_VER@
+Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-tools-jconsole-JConsole
--- a/policytool.desktop.in	Thu Sep 13 14:11:53 2018 +0100
+++ b/policytool.desktop.in	Mon Sep 17 19:35:08 2018 +0100
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ Policy Tool
+Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Policy Tool
 Comment=Manage OpenJDK policy files
 Exec=_BINDIR_/policytool
-Icon=java-@JAVA_VER@
+Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-security-tools-PolicyTool