Mercurial > hg > icedtea7

changeset 2586:60c41b88775a icedtea-2.3-branchpoint

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1138: jvisualvm.1 should not be installed in OpenJDK builds 2012-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> PR1138: jvisualvm.1 should not be installed in OpenJDK builds * Makefile.am: (ICEDTEA_PATCHES): Add new patch from IcedTea7 HEAD. * NEWS: Updated. * patches/7192804-jvisualvm.patch: Don't install jvisualvm.1.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 24 Aug 2012 01:53:07 +0100
parents acb85bf39e53
children 727519ab8096
files ChangeLog Makefile.am NEWS patches/7192804-jvisualvm.patch
diffstat 4 files changed, 44 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Aug 24 00:48:55 2012 +0100
+++ b/ChangeLog	Fri Aug 24 01:53:07 2012 +0100
@@ -1,3 +1,13 @@
+2012-08-23  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR1138: jvisualvm.1 should not be installed in OpenJDK builds
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch from
+	IcedTea7 HEAD.
+	* NEWS: Updated.
+	* patches/7192804-jvisualvm.patch:
+	Don't install jvisualvm.1.
+
 2012-08-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR1140: Unnecessary diz files should not be installed
--- a/Makefile.am	Fri Aug 24 00:48:55 2012 +0100
+++ b/Makefile.am	Fri Aug 24 01:53:07 2012 +0100
@@ -244,7 +244,8 @@
 	patches/werror-jdk.patch \
 	patches/werror-langtools.patch \
 	patches/werror-hotspot.patch \
-	patches/no_diz_files.patch
+	patches/no_diz_files.patch \
+	patches/7192804-jvisualvm.patch
 
 # Conditional patches
 
--- a/NEWS	Fri Aug 24 00:48:55 2012 +0100
+++ b/NEWS	Fri Aug 24 01:53:07 2012 +0100
@@ -21,6 +21,7 @@
   - PR1095: Add configure option for -Werror
   - PR1137: Allow JARs to be optionally compressed by setting COMPRESS_JARS
   - PR1140: Unnecessary diz files should not be installed
+  - PR1138: jvisualvm.1 should not be installed in OpenJDK builds
 * JamVM
   - ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
   - PPC: Don't use lwsync if it isn't supported
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/7192804-jvisualvm.patch	Fri Aug 24 01:53:07 2012 +0100
@@ -0,0 +1,31 @@
+# HG changeset patch
+# User andrew
+# Date 1345732943 -3600
+# Node ID d06702bfc987d0679d0c047b0897fbe7a684a608
+# Parent  968de9a6cf662529fd0fac7b54d9f8614d338da0
+7192804: Build should not install jvisualvm man page for OpenJDK
+Summary: OpenJDK builds don't ship VisualVM so shouldn't ship its man page either.
+Reviewed-by: dholmes
+
+diff --git a/make/common/Release.gmk b/make/common/Release.gmk
+--- openjdk/jdk/make/common/Release.gmk
++++ openjdk/jdk/make/common/Release.gmk
+@@ -158,7 +158,6 @@
+         jstack.1           \
+         jstat.1            \
+         jstatd.1           \
+-        jvisualvm.1        \
+ 	native2ascii.1     \
+ 	rmic.1             \
+         schemagen.1        \
+@@ -167,6 +166,10 @@
+         wsimport.1         \
+         xjc.1
+ 
++ifndef OPENJDK
++  JDK_MAN_PAGES += jvisualvm.1
++endif
++
+ ifeq ($(PLATFORM), solaris)
+   MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
+   MAN1SUBDIR=sun/man/man1