changeset in /hg/icedtea: 2007-10-09 Lillian Angel <langel at red...

[Lillian Angel]

changeset 3be97382655c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3be97382655c
description:
	2007-10-09  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Added sanity check for bootstrap/jdk1.6.0/bin/java in
	        stamps/bootstrap-directory-symlink.stamp target.

diffstat:

3 files changed, 17 insertions(+)
ChangeLog   |    5 +++++
Makefile.am |    6 ++++++
Makefile.in |    6 ++++++

diffs (44 lines):

diff -r 3c3113af9dd6 -r 3be97382655c ChangeLog
--- a/ChangeLog	Tue Oct 09 11:33:56 2007 -0400
+++ b/ChangeLog	Tue Oct 09 12:15:36 2007 -0400
@@ -1,3 +1,8 @@ 2007-10-09  Lillian Angel  <langel at redha
+2007-10-09  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Added sanity check for bootstrap/jdk1.6.0/bin/java in
+	stamps/bootstrap-directory-symlink.stamp target.
+
 2007-10-09  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-java.security.patch: Removed
diff -r 3c3113af9dd6 -r 3be97382655c Makefile.am
--- a/Makefile.am	Tue Oct 09 11:33:56 2007 -0400
+++ b/Makefile.am	Tue Oct 09 12:15:36 2007 -0400
@@ -180,6 +180,12 @@ stamps/bootstrap-directory-symlink.stamp
 	mkdir -p bootstrap
 	rm -f bootstrap/jdk1.6.0
 	ln -sf $(SYSTEM_ICEDTEA_DIR) bootstrap/jdk1.6.0
+	if ! bootstrap/jdk1.6.0/bin/java -version ; \
+	  then \
+	    echo "bootstrap/jdk1.6.0/bin/java" \
+		"cannot be found or is corrupted." ; \
+	    exit 1; \
+	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-symlink.stamp
 
diff -r 3c3113af9dd6 -r 3be97382655c Makefile.in
--- a/Makefile.in	Tue Oct 09 11:33:56 2007 -0400
+++ b/Makefile.in	Tue Oct 09 12:15:36 2007 -0400
@@ -650,6 +650,12 @@ stamps/bootstrap-directory-symlink.stamp
 	mkdir -p bootstrap
 	rm -f bootstrap/jdk1.6.0
 	ln -sf $(SYSTEM_ICEDTEA_DIR) bootstrap/jdk1.6.0
+	if ! bootstrap/jdk1.6.0/bin/java -version ; \
+	  then \
+	    echo "bootstrap/jdk1.6.0/bin/java" \
+		"cannot be found or is corrupted." ; \
+	    exit 1; \
+	fi 
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-symlink.stamp