/hg/icedtea6: Remove some old cruft.

[andrew at icedtea.classpath.org]

changeset 5d383d2ad0e5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5d383d2ad0e5
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 10 19:25:51 2010 +0000

	Remove some old cruft.

	2010-03-08 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (JAXP): Removed, redundant.
	(ABS_SOURCE_DIRS): No source code in $(abs_top_srcdir)/rt.
	(ICEDTEA_BOOTSTRAP_CLASSES): Unneeded. (HOTSPOT_MAKE_DIR):
	Redundant since switch to hs14. (stamps/ports.stamp): Remove
	use of HOTSPOT_MAKE_DIR.


diffstat:

2 files changed, 17 insertions(+), 14 deletions(-)
ChangeLog   |   15 ++++++++++++---
Makefile.am |   16 +++++-----------

diffs (105 lines):

diff -r 07549bdf98bb -r 5d383d2ad0e5 ChangeLog
--- a/ChangeLog	Wed Mar 10 12:19:43 2010 +0100
+++ b/ChangeLog	Wed Mar 10 19:25:51 2010 +0000
@@ -1,3 +1,12 @@ 2010-03-10  Hideki Yamane <henrich at debia
+2010-03-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(JAXP): Removed, redundant.
+	(ABS_SOURCE_DIRS): No source code in $(abs_top_srcdir)/rt.
+	(ICEDTEA_BOOTSTRAP_CLASSES): Unneeded.
+	(HOTSPOT_MAKE_DIR): Redundant since switch to hs14.
+	(stamps/ports.stamp): Remove use of HOTSPOT_MAKE_DIR.
+
 2010-03-10  Hideki Yamane <henrich at debian.or.jp>
 
 	* patches/icedtea-fonts.patch: Use Sazanami instead of Kochi for
@@ -20,7 +29,7 @@ 2010-03-09  Deepak Bhole <dbhole at redhat.
 	(setMember): Same. Also, move responding code from _setMember to setMember
 	for consistency and to solve a rather bad race condition that affected
 	reliability.
-	(sendMember): Account for the new reference field and send it back 
+	(sendMember): Account for the new reference field and send it back
 	with the response.
 	(queue_processor): Move array index slots based on new positions with
 	reference ids.
@@ -32,7 +41,7 @@ 2010-03-09  Deepak Bhole <dbhole at redhat.
 	(serviceable): Removed method. serviceable() is now implemented in the
 	parent class and uses unique reference identifiers.
 	* plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java
-	(GetWindowPluginCallRequest): Change method signature to receive a 
+	(GetWindowPluginCallRequest): Change method signature to receive a
 	reference identifier.
 	(serviceable): Removed method. serviceable() is now implemented in the
 	parent class and uses unique reference identifiers.
@@ -40,7 +49,7 @@ 2010-03-09  Deepak Bhole <dbhole at redhat.
 	statis private requestIdentityCounter variable that provides unique
 	reference numbers.
 	(createPanel): Send a dummy (0) reference number with initialization msg.
-	(getRequestIdentifier): New method. Returns a unique reference number 
+	(getRequestIdentifier): New method. Returns a unique reference number
 	and then increments requestIdentityCounter in a thread-safe manner.
 	(getWindow): Send reference id to getPluginCallRequest.
 	(getMember): Same.
diff -r 07549bdf98bb -r 5d383d2ad0e5 Makefile.am
--- a/Makefile.am	Wed Mar 10 12:19:43 2010 +0100
+++ b/Makefile.am	Wed Mar 10 19:25:51 2010 +0000
@@ -59,7 +59,6 @@ SHARE = openjdk-ecj/jdk/src/share/classe
 SHARE = openjdk-ecj/jdk/src/share/classes
 SOLARIS = openjdk-ecj/jdk/src/solaris/classes
 LANGTOOLS = openjdk-ecj/langtools/src/share/classes
-JAXP = openjdk-ecj/jaxp/src/share/classes
 CORBA = openjdk-ecj/corba/src/share/classes
 
 # FIXME (netx): NetX source directories go here
@@ -67,9 +66,9 @@ OPENJDK_SOURCEPATH_DIRS = \
 OPENJDK_SOURCEPATH_DIRS = \
         $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA)
 
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
+ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
 
-# Sources copied from OpenJDK.
+# Sources used from OpenJDK.
 ICEDTEA_BOOTSTRAP_DIRS = \
 	$(SHARE)/com/sun/jdi \
 	$(SHARE)/com/sun/jmx/snmp/agent \
@@ -89,10 +88,6 @@ ICEDTEA_BOOTSTRAP_DIRS = \
 	$(SHARE)/javax/security/sasl \
 	$(LANGTOOLS)/com/sun/mirror \
 	$(LANGTOOLS)/com/sun/tools/apt
-
-ICEDTEA_BOOTSTRAP_CLASSES = \
-	$(SHARE)/java/nio/StringCharBuffer.java \
-	$(SHARE)/sun/misc/Unsafe.java
 
 # FIXME (javac): Settings for javac go here
 
@@ -179,9 +174,6 @@ PULSE_JAVA_TARGET = stamps/pulse-java.st
 PULSE_JAVA_TARGET = stamps/pulse-java.stamp
 PULSE_JAVA_CLEAN_TARGET = clean-pulse-java
 endif
-
-# FIXME (HotSpot): no longer needed
-HOTSPOT_MAKE_DIR = make
 
 # FIXME: This should not depend on bootstrapping
 # but on whether MEMORY_LIMIT is accepted
@@ -347,6 +339,8 @@ endif
 endif
 
 if ENABLE_XRENDER
+# match against $(abs_top_srcdir) and then remove it again,
+# because stamps/patch.stamp target will also add it
 XRENDER_PATCHES = patches/xrender/icedtea-???.patch
 XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
 ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
@@ -996,7 +990,7 @@ stamps/ports.stamp: stamps/replace-hotsp
 		      $(abs_top_srcdir)/ports/hotspot/tools \
 		      $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
 		      $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
-	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/$(HOTSPOT_MAKE_DIR)#"); \
+	  link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
 	  cp -rv $$target $$link; \
 	done
 	if ! test "x$(WITH_CACAO)" = "xno" ; then \