changeset in /hg/icedtea: 2007-11-13 Lillian Angel <langel at red...

[Lillian Angel]

changeset ac8264412dd7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ac8264412dd7
description:
	2007-11-13  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-ecj.patch
	        (stamps/bootstrap-directory-ecj.stamp): Added links to tools.jar and
	        rt.jar if built prior to creating bootstrap/ecj. Fixes problem where
	        make tools or make plugs is called before make.

diffstat:

3 files changed, 29 insertions(+)
ChangeLog   |    7 +++++++
Makefile.am |   11 +++++++++++
Makefile.in |   11 +++++++++++

diffs (56 lines):

diff -r 0f4e3d823c08 -r ac8264412dd7 ChangeLog
--- a/ChangeLog	Tue Nov 13 11:10:31 2007 -0500
+++ b/ChangeLog	Tue Nov 13 16:33:27 2007 -0500
@@ -1,3 +1,10 @@ 2007-11-13  Lillian Angel  <langel at redha
+2007-11-13  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-ecj.patch
+	(stamps/bootstrap-directory-ecj.stamp): Added links to tools.jar and
+	rt.jar if built prior to creating bootstrap/ecj. Fixes problem where
+	make tools or make plugs is called before make.
+
 2007-11-13  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-ecj.patch
diff -r 0f4e3d823c08 -r ac8264412dd7 Makefile.am
--- a/Makefile.am	Tue Nov 13 11:10:31 2007 -0500
+++ b/Makefile.am	Tue Nov 13 16:33:27 2007 -0500
@@ -387,6 +387,17 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	if bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	then \
+		mkdir -p bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+	if bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	then \
+		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			bootstrap/ecj/jre/lib/rt.jar; \
+	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
diff -r 0f4e3d823c08 -r ac8264412dd7 Makefile.in
--- a/Makefile.in	Tue Nov 13 11:10:31 2007 -0500
+++ b/Makefile.in	Tue Nov 13 16:33:27 2007 -0500
@@ -807,6 +807,17 @@ stamps/bootstrap-directory-ecj.stamp:
 	ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar
 	mkdir -p bootstrap/ecj/jre/lib
 	ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/$(INSTALL_ARCH_DIR) bootstrap/ecj/jre/lib/
+	if bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
+	then \
+		mkdir -p bootstrap/ecj/lib ; \
+		ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
+	            $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+	if bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
+	then \
+		cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+			bootstrap/ecj/jre/lib/rt.jar; \
+	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp