changeset in /hg/icedtea: Support NIO2.

[Andrew John Hughes]

changeset 1ae3ef81f9b2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1ae3ef81f9b2
description:
	Support NIO2.

	2008-09-04  C. K. Jester-Young  <cky944 at gmail.com>

		* Makefile.am,
		* acinclude.m4:
		Add support for NIO2.

diffstat:

3 files changed, 13 insertions(+), 1 deletion(-)
ChangeLog    |    6 ++++++
Makefile.am  |    5 +++++
acinclude.m4 |    3 ++-

diffs (62 lines):

diff -r 1427ec4417d3 -r 1ae3ef81f9b2 ChangeLog
--- a/ChangeLog	Wed Nov 19 12:47:19 2008 +0000
+++ b/ChangeLog	Thu Nov 20 00:41:27 2008 +0000
@@ -1,3 +1,9 @@ 2008-11-19  Andrew John Hughes  <ahughes
+2008-09-04  C. K. Jester-Young  <cky944 at gmail.com>
+
+	* Makefile.am,
+	* acinclude.m4:
+	Add support for NIO2.
+
 2008-11-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-version.patch,
diff -r 1427ec4417d3 -r 1ae3ef81f9b2 Makefile.am
--- a/Makefile.am	Wed Nov 19 12:47:19 2008 +0000
+++ b/Makefile.am	Thu Nov 20 00:41:27 2008 +0000
@@ -1552,6 +1552,7 @@ CLOSURES_HG_URL = http://hg.openjdk.java
 CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
 CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
 BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
+NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
 
 OPENJDK_URL = http://www.java.net/download/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
 if USE_ALT_OPENJDK_SRC_ZIP
@@ -1612,6 +1613,9 @@ else
 else
 if USE_BSD
 	$(HG) fclone $(BSD_HG_URL) openjdk;
+else
+if USE_NIO2
+	hg fclone $(NIO2_HG_URL) openjdk;
 else
 if USE_HG
 	$(HG) fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
@@ -1625,6 +1629,7 @@ else
 	  fi ; \
 	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
+endif
 endif
 endif
 endif
diff -r 1427ec4417d3 -r 1ae3ef81f9b2 acinclude.m4
--- a/acinclude.m4	Wed Nov 19 12:47:19 2008 +0000
+++ b/acinclude.m4	Thu Nov 20 00:41:27 2008 +0000
@@ -968,7 +968,7 @@ AC_DEFUN([WITH_PROJECT],
 [
   AC_MSG_CHECKING(which OpenJDK project is being used)
   AC_ARG_WITH([project],
-              [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: jdk7 closures cvmi cacioavallo bsd [[default=jdk7]])],
+              [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: jdk7 closures cvmi caciocavallo bsd nio2 [[default=jdk7]])],
   [
     case "${withval}" in
       yes)
@@ -991,6 +991,7 @@ AC_DEFUN([WITH_PROJECT],
   AM_CONDITIONAL([USE_CVMI], test x"${project}" = "xcvmi")
   AM_CONDITIONAL([USE_CACIOCAVALLO], test x"${project}" = "xcaciocavallo")
   AM_CONDITIONAL([USE_BSD], test x"${project}" = "xbsd")
+  AM_CONDITIONAL([USE_NIO2], test x"${project}" = "xnio2")
 ])
 
 AC_DEFUN([AC_CHECK_WITH_GCJ],