/hg/icedtea: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 68119ec8f861 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=68119ec8f861
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 23 14:08:37 2011 +0100

	Revert to copying not linking the HotSpot directory.

	2011-05-22 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (replace-hotspot): Revert to copying
	not linking; breaks the build in strange ways.


changeset c644df7984ad in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c644df7984ad
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 23 15:48:03 2011 +0100

	Make sure IT_LOCATE_NSS macro is called and include --enable-nss
	logic it depends on.

	2011-05-23 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (IT_LOCATE_NSS): Add --enable-nss
	logic.
		* configure.ac: Move --enable-nss logic to IT_LOCATE_NSS
	macro. Call IT_LOCATE_NSS macro.


changeset 3024025d7759 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3024025d7759
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 23 15:52:47 2011 +0100

	Merge


diffstat:

 ChangeLog                      |  21 +++++++++++++++++++++
 Makefile.am                    |   5 +++--
 acinclude.m4                   |  13 +++++++++++++
 configure.ac                   |  14 +-------------
 test/jtreg/excludelist.jdk.jtx |   6 ++++++
 5 files changed, 44 insertions(+), 15 deletions(-)

diffs (110 lines):

diff -r 1af45d3c1f92 -r 3024025d7759 ChangeLog
--- a/ChangeLog	Fri May 20 03:23:45 2011 +0100
+++ b/ChangeLog	Mon May 23 15:52:47 2011 +0100
@@ -1,3 +1,24 @@
+2011-05-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(IT_LOCATE_NSS): Add --enable-nss logic.
+	* configure.ac:
+	Move --enable-nss logic to IT_LOCATE_NSS macro.
+	Call IT_LOCATE_NSS macro.
+
+2011-05-23  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* test/jtreg/excludelist.jdk.jtx:
+	Added LocaleEnhanceTest to a JTreg exclude list,
+	because the test base class can not be used
+	in IcedTea due to questionable licence.
+
+2011-05-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(replace-hotspot): Revert to copying not
+	linking; breaks the build in strange ways.
+
 2011-05-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r 1af45d3c1f92 -r 3024025d7759 Makefile.am
--- a/Makefile.am	Fri May 20 03:23:45 2011 +0100
+++ b/Makefile.am	Mon May 23 15:52:47 2011 +0100
@@ -1244,8 +1244,9 @@
 	    fi ; \
 	    if ! test -d openjdk/hotspot ; \
 	    then \
-	      ln -s $(abs_top_builddir)/hotspot-$(HS_CHANGESET) \
-	        openjdk/hotspot ; \
+	      mv hotspot-$(HS_CHANGESET) openjdk/hotspot ; \
+	    else \
+	      rm -rf hotspot-$(HS_CHANGESET) ; \
 	    fi ; \
 	  fi ; \
 	fi
diff -r 1af45d3c1f92 -r 3024025d7759 acinclude.m4
--- a/acinclude.m4	Fri May 20 03:23:45 2011 +0100
+++ b/acinclude.m4	Mon May 23 15:52:47 2011 +0100
@@ -1686,6 +1686,18 @@
 AC_DEFUN_ONCE([IT_LOCATE_NSS],
 [
 AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR])
+AC_MSG_CHECKING([whether to enable the NSS-based security provider])
+AC_ARG_ENABLE([nss],
+	      [AS_HELP_STRING([--enable-nss],
+	      		      [Enable inclusion of NSS security provider])],
+	      [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no'])
+AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
+if test "x${ENABLE_NSS}" = "xyes"
+then
+  AC_MSG_RESULT([enabled by default (edit java.security to disable)])
+else
+  AC_MSG_RESULT([disabled by default (edit java.security to enable)])
+fi
 PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no])
 if test "x${NSS_FOUND}" = xno
 then
@@ -1702,6 +1714,7 @@
 AC_SUBST(NSS_LIBDIR)
 AC_CONFIG_FILES([nss.cfg])
 ])
+
 AC_DEFUN([IT_DIAMOND_CHECK],[
   AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [
   CLASS=Test.java
diff -r 1af45d3c1f92 -r 3024025d7759 configure.ac
--- a/configure.ac	Fri May 20 03:23:45 2011 +0100
+++ b/configure.ac	Mon May 23 15:52:47 2011 +0100
@@ -83,19 +83,7 @@
 AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
 AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
 
-AC_MSG_CHECKING([whether to include the NSS-based security provider])
-AC_ARG_ENABLE([nss],
-	      [AS_HELP_STRING([--enable-nss],
-	      		      [Enable inclusion of NSS security provider])],
-	      [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no'])
-AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
-if test "x${ENABLE_NSS}" = "xyes"
-then
-  AC_MSG_RESULT([enabled by default (edit java.security to disable)])
-else
-  AC_MSG_RESULT([disabled by default (edit java.security to enable)])
-fi
-
+IT_LOCATE_NSS
 IT_GET_PKGVERSION
 IT_GET_LSB_DATA
 
diff -r 1af45d3c1f92 -r 3024025d7759 test/jtreg/excludelist.jdk.jtx
--- a/test/jtreg/excludelist.jdk.jtx	Fri May 20 03:23:45 2011 +0100
+++ b/test/jtreg/excludelist.jdk.jtx	Mon May 23 15:52:47 2011 +0100
@@ -197,3 +197,9 @@
 java/awt/FontClass/CreateFont/fileaccess/FontFile.java
 java/awt/FontClass/CreateFont/DeleteFont.sh
 java/awt/FontClass/CreateFont/bigfont.html
+
+# This test cannot be compiled because it's base class
+# LocaleTestFmwk is deleted during the "liberation" phase
+# of build process (this class has questionable licence).
+java/util/Locale/LocaleEnhanceTest.java
+