/hg/icedtea6: Build bootstrap classes from ecj tree, which is no...

[andrew at icedtea.classpath.org]

changeset 7d4276d04ffc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7d4276d04ffc
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 08 13:52:05 2010 +0000

	Build bootstrap classes from ecj tree, which is now copied, not
	linked.

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

	 * Makefile.am: (SHARE): Use openjdk-ecj for building
	bootstrap classes. (SOLARIS): Likewise. (LANGTOOLS):
	Likewise. (CORBA): Likewise. (JAXP): Likewise.
	(OPENJDK_ECJ_TREE): Target for obtaining a patched OpenJDK-ecj tree.
	(stamps/extract-ecj.stamp): Copy, don't link. (stamps
	/icedtea-boot.stamp): Use OPENJDK_ECJ_TREE rather than
	patch-ecj.stamp. (rt-source-files.txt): Depend on
	$(OPENJDK_ECJ_TREE) ensuring ecj patched versions are used.


diffstat:

2 files changed, 28 insertions(+), 8 deletions(-)
ChangeLog   |   15 +++++++++++++++
Makefile.am |   21 +++++++++++++--------

diffs (81 lines):

diff -r b89dcb5b872c -r 7d4276d04ffc ChangeLog
--- a/ChangeLog	Thu Mar 04 19:41:16 2010 +0000
+++ b/ChangeLog	Mon Mar 08 13:52:05 2010 +0000
@@ -1,3 +1,18 @@ 2010-03-04  Andrew John Hughes  <ahughes
+2010-03-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(SHARE): Use openjdk-ecj for building bootstrap classes.
+	(SOLARIS): Likewise.
+	(LANGTOOLS): Likewise.
+	(CORBA): Likewise.
+	(JAXP): Likewise.
+	(OPENJDK_ECJ_TREE): Target for obtaining a patched OpenJDK-ecj tree.
+	(stamps/extract-ecj.stamp): Copy, don't link.
+	(stamps/icedtea-boot.stamp): Use OPENJDK_ECJ_TREE rather than
+	patch-ecj.stamp.
+	(rt-source-files.txt): Depend on $(OPENJDK_ECJ_TREE) ensuring
+	ecj patched versions are used.
+
 2010-03-04  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r b89dcb5b872c -r 7d4276d04ffc Makefile.am
--- a/Makefile.am	Thu Mar 04 19:41:16 2010 +0000
+++ b/Makefile.am	Mon Mar 08 13:52:05 2010 +0000
@@ -56,11 +56,11 @@ BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_OUTPU
 
 # Source directories
 
-SHARE = openjdk/jdk/src/share/classes
-SOLARIS = openjdk/jdk/src/solaris/classes
-LANGTOOLS = openjdk/langtools/src/share/classes
-JAXP = openjdk/jaxp/src/share/classes
-CORBA = openjdk/corba/src/share/classes
+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
 
@@ -212,6 +212,11 @@ endif
 # Target to ensure a patched OpenJDK tree containing Zero & Shark
 # and any overlays is available in $(abs_top_builddir)/openjdk
 OPENJDK_TREE = stamps/overlay.stamp
+
+# Target to ensure a patched OpenJDK bootstrap tree containing
+# Zero & Shark, any other overlays and the bootstrapping patches
+# is available in $(abs_top_builddir)/openjdk-ecj
+OPENJDK_ECJ_TREE = stamps/patch-ecj.stamp
 
 # Sources list
 
@@ -1159,7 +1164,7 @@ endif
 # FIXME (missing): Rename to clone-ecj.
 stamps/extract-ecj.stamp: $(OPENJDK_TREE)
 	if ! test -d openjdk-ecj ; then \
-	    cp -pPRl openjdk openjdk-ecj ; \
+	    cp -a openjdk openjdk-ecj ; \
 	fi
 	mkdir -p stamps
 	touch stamps/extract-ecj.stamp
@@ -1553,7 +1558,7 @@ stamps/icedtea-debug-against-icedtea.sta
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/plugs.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
+	stamps/plugs.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \
 	stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
@@ -2131,7 +2136,7 @@ jtregcheck: jtreg check-hotspot check-la
 # Support classes for non-OpenJDK bootstraps
 
 # rt.jar additional class files.
-rt-source-files.txt: $(OPENJDK_TREE)
+rt-source-files.txt: $(OPENJDK_ECJ_TREE)
 	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
 	  | sort -u > $@
 	for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \