rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea-jhat.patch, 1.3, 1.4

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9477

Modified Files:
	java-1.7.0-icedtea-jhat.patch 
Log Message:
Updated patch.



java-1.7.0-icedtea-jhat.patch:

Index: java-1.7.0-icedtea-jhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea-jhat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-1.7.0-icedtea-jhat.patch	12 Oct 2007 03:23:46 -0000	1.3
+++ java-1.7.0-icedtea-jhat.patch	12 Oct 2007 13:41:06 -0000	1.4
@@ -1,25 +1,14 @@
---- ../icedtea/openjdk-ecj/j2se/make/sun/Makefile	2007-08-24 12:47:38.000000000 -0400
-+++ openjdk/j2se/make/sun/Makefile	2007-08-27 14:42:08.000000000 -0400
-@@ -40,7 +40,7 @@
- ifndef J2RE_ONLY
-   TOOLS_SUBDIRS  = javap native2ascii serialver jps jstat jstatd
-   TOOLS_SUBDIRS += $(JSADEBUGD_SUBDIR)
--  TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript jhat
-+  TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript
- endif
- 
- # Rhino/Mozilla java sources
---- ../icedtea/openjdk/j2se/make/common/Release.gmk	2007-08-16 03:17:47.000000000 -0400
-+++ openjdk/j2se/make/common/Release.gmk	2007-08-27 14:51:39.000000000 -0400
-@@ -169,7 +169,6 @@
- 	javap.1 \
- 	jconsole.1 \
- 	jdb.1 \
--	jhat.1 \
-   jinfo.1 \
-   jmap.1 \
-   jps.1 \
-@@ -352,7 +351,6 @@
+--- openjdk.old/j2se/make/common/Release.gmk	2007-09-27 03:52:06.000000000 -0400
++++ openjdk/j2se/make/common/Release.gmk	2007-10-12 08:21:55.000000000 -0400
+@@ -165,7 +165,6 @@
+ 	javap.1            \
+ 	jconsole.1         \
+ 	jdb.1              \
+-	jhat.1             \
+         jinfo.1            \
+         jmap.1             \
+         jps.1              \
+@@ -373,7 +372,6 @@
  	com/sun/tools/example/debug/expr \
  	com/sun/tools/example/debug/tty  \
  	com/sun/tools/extcheck  \
@@ -27,7 +16,7 @@
  	com/sun/tools/javac     \
  	com/sun/tools/javadoc   \
  	com/sun/tools/apt       \
-@@ -462,8 +460,7 @@
+@@ -472,8 +470,7 @@
  	wsgen$(EXE_SUFFIX) \
  	wsimport$(EXE_SUFFIX) \
          schemagen$(EXE_SUFFIX) \
@@ -37,3 +26,37 @@
  
  # The following get removed from the JRE after the bulk-copy of LIBDIR...
  NOTJRELIBS = tools.jar \
+--- openjdk.old/j2se/make/sun/tools/Makefile	2007-09-27 03:52:13.000000000 -0400
++++ openjdk/j2se/make/sun/tools/Makefile	2007-10-12 08:30:38.000000000 -0400
+@@ -42,7 +42,6 @@
+   sun/tools/jstack \
+   sun/tools/jstat \
+   sun/tools/jstatd \
+-  com/sun/tools/hat \
+   com/sun/tools/script/shell \
+   sun/jvmstat
+ 
+@@ -50,13 +49,6 @@
+ FILES_copy += \
+   $(CLASSDESTDIR)/sun/tools/jstat/resources/jstat_options
+ 
+-# Extra jhat files
+-JHAT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/hat/resources
+-FILES_copy += \
+-  $(JHAT_RESOURCEDIR)/hat.js \
+-  $(JHAT_RESOURCEDIR)/oqlhelp.html \
+-  $(JHAT_RESOURCEDIR)/platform_names.txt
+-
+ # Extra jrunscript files
+ JRUNSCRIPT_RESOURCEDIR = $(CLASSDESTDIR)/com/sun/tools/script/shell
+ FILES_copy = \
+--- openjdk.old/j2se/make/launchers/Makefile	2007-09-27 03:52:09.000000000 -0400
++++ openjdk/j2se/make/launchers/Makefile	2007-10-12 08:31:08.000000000 -0400
+@@ -70,7 +70,6 @@
+ $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
+   -J-Djconsole.showOutputViewer, )
+ $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )
+-$(call make-launcher, jhat, com.sun.tools.hat.Main, , )
+ $(call make-launcher, jinfo, sun.tools.jinfo.JInfo, \
+   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
+   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )