Mercurial > hg > release > icedtea6-1.12

changeset 2002:7284d32445e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove BINARY_PLUGS_PATH environment variable setting and dead tools.jar targets. 2010-03-19 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (ICEDTEA_ENV): Remove BINARY_PLUGS_PATH. (tools.stamp): Removed. (clean-tools): Removed.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 29 Mar 2010 13:29:04 +0100
parents e5871a3b65f7
children 433756a5db2c
files ChangeLog Makefile.am
diffstat 2 files changed, 7 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 25 15:29:28 2010 +0100
+++ b/ChangeLog	Mon Mar 29 13:29:04 2010 +0100
@@ -11,6 +11,13 @@
 2010-03-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
+	(ICEDTEA_ENV): Remove BINARY_PLUGS_PATH.
+	(tools.stamp): Removed.
+	(clean-tools): Removed.
+
+2010-03-19  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
 	(ICEDTEA_ENV_ECJ): Include ICEDTEA_ENV.
 	Remove duplication between ICEDTEA_ENV
 	and ICEDTEA_ENV_ECJ.
--- 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 @@
 	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
 	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
 # ===============