/hg/icedtea: Provide tools.jar in first stage bootstrap.

[andrew at icedtea.classpath.org]

changeset 280e9959fbea in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=280e9959fbea
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 18 20:50:26 2011 +0100

	Provide tools.jar in first stage bootstrap.

	2011-05-18 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (bootstrap-directory-stage1): Link
	tools.jar if available. Otherwise, link to existing rt.jar.


diffstat:

 ChangeLog   |  6 ++++++
 Makefile.am |  8 +++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 0bea9271a681 -r 280e9959fbea ChangeLog
--- a/ChangeLog	Mon May 16 16:52:29 2011 +0200
+++ b/ChangeLog	Wed May 18 20:50:26 2011 +0100
@@ -1,3 +1,9 @@
+2011-05-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(bootstrap-directory-stage1): Link tools.jar
+	if available.  Otherwise, link to existing rt.jar.
+
 2011-05-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* test/jtreg/README:
diff -r 0bea9271a681 -r 280e9959fbea Makefile.am
--- a/Makefile.am	Mon May 16 16:52:29 2011 +0200
+++ b/Makefile.am	Wed May 18 20:50:26 2011 +0100
@@ -1601,7 +1601,13 @@
 	mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
 	  $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \
-	chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \
+	chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
+	mkdir -p $(STAGE1_BOOT_DIR)/lib && \
+	if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \
+	  ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
+	else \
+	  ln -sf $(STAGE1_BOOT_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
+	fi
 	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
 	  $(STAGE1_BOOT_DIR)/jre/lib/ && \
 	if ! test -d $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \