Mercurial > hg > release > icedtea-1.9
changeset 1435:1ae3ef81f9b2
Support NIO2.
2008-09-04 C. K. Jester-Young <cky944@gmail.com>
* Makefile.am,
* acinclude.m4:
Add support for NIO2.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 20 Nov 2008 00:41:27 +0000 |
| parents | 1427ec4417d3 |
| children | c5f13156e70a |
| files | ChangeLog Makefile.am acinclude.m4 |
| diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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-09-04 C. K. Jester-Young <cky944@gmail.com> + + * Makefile.am, + * acinclude.m4: + Add support for NIO2. + 2008-11-19 Andrew John Hughes <ahughes@redhat.com> * patches/icedtea-version.patch,
--- 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.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 @@ -1613,6 +1614,9 @@ 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; else @@ -1632,6 +1636,7 @@ endif endif endif +endif if WITH_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP
--- 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_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 @@ 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],