/hg/icedtea7: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 04bf32baa40f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=04bf32baa40f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 28 21:55:51 2011 +0100

	Update list of JDKs to check. Only check for IcedTea6 VMs when not
	bootstrapping until PR716 is fixed.

	2011-09-27 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (AC_CHECK_FOR_JDK): Look for
	IcedTea7 JDKs. Don't check for IcedTea6 JDKs when
	bootstrapping until PR716 is fixed.


changeset e4c9d9bd4a99 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e4c9d9bd4a99
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 28 23:07:27 2011 +0100

	Remove patch directories that no longer exist, in order to fix make
	distcheck.

	2011-09-27 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (EXTRA_DIST): Remove patch
	directories that no longer exist.


changeset 05ed8db6b216 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=05ed8db6b216
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 28 23:07:52 2011 +0100

	Added tag icedtea-2.0-branchpoint for changeset e4c9d9bd4a99


diffstat:

 .hgtags      |   1 +
 ChangeLog    |  13 +++++++++++++
 Makefile.am  |   2 --
 acinclude.m4 |   8 +++++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 8d011581534d -r 05ed8db6b216 .hgtags
--- a/.hgtags	Wed Sep 28 21:44:40 2011 +0100
+++ b/.hgtags	Wed Sep 28 23:07:52 2011 +0100
@@ -30,3 +30,4 @@
 d96a0228b79286eea28af85707fd8ccc42cbed84 icedtea-1.12
 13b9a6c006730355f1441c69649775e7cebd8aa0 icedtea-1.13
 1b47f8cc8c754841c63dfcddc41a11f1b012bddd icedtea-1.14
+e4c9d9bd4a99ee2993e6737a84ccb9792fa7c4d1 icedtea-2.0-branchpoint
diff -r 8d011581534d -r 05ed8db6b216 ChangeLog
--- a/ChangeLog	Wed Sep 28 21:44:40 2011 +0100
+++ b/ChangeLog	Wed Sep 28 23:07:52 2011 +0100
@@ -1,3 +1,16 @@
+2011-09-27  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(EXTRA_DIST): Remove patch directories that
+	no longer exist.
+
+2011-09-27  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(AC_CHECK_FOR_JDK): Look for IcedTea7 JDKs.
+	Don't check for IcedTea6 JDKs when bootstrapping
+	until PR716 is fixed.
+
 2011-09-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR790: Include JAXP, JAF and JAXWS sources directly
diff -r 8d011581534d -r 05ed8db6b216 Makefile.am
--- a/Makefile.am	Wed Sep 28 21:44:40 2011 +0100
+++ b/Makefile.am	Wed Sep 28 23:07:52 2011 +0100
@@ -706,9 +706,7 @@
 EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
 	$(top_srcdir)/patches/boot/*.patch \
 	$(top_srcdir)/patches/cacao/*.patch \
-	$(top_srcdir)/patches/debian/*.patch \
 	$(top_srcdir)/patches/jamvm/*.patch \
-	$(top_srcdir)/patches/security/*.patch \
 	tools-copy contrib overlays \
 	javaws.png javaws.desktop \
 	jconsole.desktop policytool.desktop \
diff -r 8d011581534d -r 05ed8db6b216 acinclude.m4
--- a/acinclude.m4	Wed Sep 28 21:44:40 2011 +0100
+++ b/acinclude.m4	Wed Sep 28 23:07:52 2011 +0100
@@ -1138,10 +1138,12 @@
   if test -z "${SYSTEM_JDK_DIR}"; then
     if test "x${enable_bootstrap}" = "xyes"; then
       BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
+    else
+      ICEDTEA6_VMS="/usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk"
     fi
-    for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \
-    	       /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
-	       /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
+    ICEDTEA7_VMS="/usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk"
+    for dir in ${BOOTSTRAP_VMS} ${ICEDTEA7_VMS} ${ICEDTEA6_VMS} \
+    	       /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
        if test -d $dir; then
          SYSTEM_JDK_DIR=$dir
 	 break