/hg/icedtea6: Remove BINARY_PLUGS_PATH environment variable sett...

[andrew at icedtea.classpath.org]

changeset 7284d32445e4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7284d32445e4
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Mar 29 13:29:04 2010 +0100

	Remove BINARY_PLUGS_PATH environment variable setting and dead
	tools.jar targets.

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

	 * Makefile.am: (ICEDTEA_ENV): Remove
	BINARY_PLUGS_PATH. (tools.stamp): Removed. (clean-
	tools): Removed.


diffstat:

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

diffs (55 lines):

diff -r e5871a3b65f7 -r 7284d32445e4 ChangeLog
--- a/ChangeLog	Thu Mar 25 15:29:28 2010 +0100
+++ b/ChangeLog	Mon Mar 29 13:29:04 2010 +0100
@@ -7,6 +7,13 @@ 2010-03-22  Deepak Bhole <dbhole at redhat.
 	* plugin/icedteanp/IcedTeaNPPlugin.cc
 	(start_jvm_if_needed): Change pipe file name format.
 	(NP_Initialize): Put FIFO pipe in a separate per-user directory.
+
+2010-03-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_ENV): Remove BINARY_PLUGS_PATH.
+	(tools.stamp): Removed.
+	(clean-tools): Removed.
 
 2010-03-19  Andrew John Hughes  <ahughes at redhat.com>
 
diff -r e5871a3b65f7 -r 7284d32445e4 Makefile.am
--- a/Makefile.am	Thu Mar 25 15:29:28 2010 +0100
+++ b/Makefile.am	Mon Mar 29 13:29:04 2010 +0100
@@ -422,7 +422,6 @@ ICEDTEA_ENV = \
 	LANG="C" \
 	PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
 	ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
-	ALT_BINARY_PLUGS_PATH="$(abs_top_builddir)/bootstrap/jdk1.7.0" \
 	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
 	ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR)" \
 	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
@@ -2094,26 +2093,6 @@ endif
 endif
 	touch stamps/rt.stamp
 
-# tools.jar
-stamps/tools.stamp:
-	mkdir -p bootstrap/jdk1.7.0/jre/lib/
-	ln -sf $(ICEDTEA_RT) $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar
-	if test -d bootstrap/ecj ; \
-	then \
-	  mkdir -p bootstrap/ecj/lib/; \
-	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
-	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
-	fi
-	mkdir -p stamps
-	touch stamps/tools.stamp
-
-clean-tools-jar: 
-	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
-	if test -d bootstrap/ecj/lib ; then \
-	  rm -f $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
-	fi
-	rm -f stamps/tools.stamp
-
 # Target Aliases
 # ===============