/hg/release/icedtea6-1.7: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 9f3f2ba0b31a in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=9f3f2ba0b31a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 27 15:35:17 2010 +0000

	Add a target for building the plugin tests.

	2010-01-26 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (stamps/plugin-tests.stamp): Add
	a target for building the plugin tests. (plugin-tests):
	Alias for the above.


changeset 190eabd599ed in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=190eabd599ed
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 27 15:36:28 2010 +0000

	Merge


diffstat:

3 files changed, 58 insertions(+), 6 deletions(-)
ChangeLog   |   16 ++++++++++++++++
Makefile.am |   45 +++++++++++++++++++++++++++++++++++++++------
NEWS        |    3 +++

diffs (112 lines):

diff -r 5a04427d184c -r 190eabd599ed ChangeLog
--- a/ChangeLog	Tue Jan 26 19:45:53 2010 +0000
+++ b/ChangeLog	Wed Jan 27 15:36:28 2010 +0000
@@ -1,3 +1,19 @@ 2010-01-25 Andrew John Hughes  <ahughes@
+2010-01-27  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
+	ICEDTEA_PKG.  
+
+2010-01-26 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(stamps/plugin-tests.stamp): Add
+	a target for building the plugin tests.
+	(plugin-tests): Alias for the above.
+
+2010-01-26  Deepak Bhole <dbhole at redhat.com>
+
+	* NEWS: Added message about alpha release for the new NPR based plugin.
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r 5a04427d184c -r 190eabd599ed Makefile.am
--- a/Makefile.am	Tue Jan 26 19:45:53 2010 +0000
+++ b/Makefile.am	Wed Jan 27 15:36:28 2010 +0000
@@ -190,6 +190,10 @@ else
   BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
   ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
 endif
+
+# Sources list
+
+PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
 
 # Patch list
 
@@ -382,15 +386,15 @@ JDK_UPDATE_VERSION = $(shell echo $(OPEN
 JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-ICEDTEA_NAME="IcedTea6"
+ICEDTEA_NAME = IcedTea6
 if HAS_ICEDTEA_REVISION
-ICEDTEA_REV="+${ICEDTEA_REVISION}"
+ICEDTEA_REV = +${ICEDTEA_REVISION}
 endif
 if HAS_PKGVERSION
-ICEDTEA_PKG=" (${PKGVERSION})"
-endif
-
-PLUGIN_VERSION=$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
+ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
+endif
+
+PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
 
 ICEDTEA_ENV = \
 	IMPORT_BINARY_PLUGS=true \
@@ -1892,6 +1896,33 @@ endif
 
 # end additional VMs
 
+# plugin tests
+
+stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) \
+ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+	mkdir -p plugin/tests/LiveConnect
+	if test -d lib/rt/netscape ; then \
+	  set -e ; \
+	  if ! test -d $(ICEDTEA_BOOT_DIR) ; then \
+	    $(JAVAC) $(MEMORY_LIMIT) -g -d plugin/tests/LiveConnect \
+	      -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+              -source 1.5 $(PLUGIN_TEST_SRCS) ; \
+	    $(JAR) cf plugin/tests/LiveConnect/PluginTest.jar \
+	      plugin/tests/LiveConnect/*.class ; \
+	  else \
+	    $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
+	      -d plugin/tests/LiveConnect \
+	      -classpath bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+	      -source 1.5 $(PLUGIN_TEST_SRCS) ; \
+	    $(ICEDTEA_BOOT_DIR)/bin/jar cf plugin/tests/LiveConnect/PluginTest.jar \
+	      plugin/tests/LiveConnect/*.class ; \
+	  fi ; \
+	  cp -a $(abs_top_srcdir)/plugin/tests/LiveConnect/*.{js,html} plugin/tests/LiveConnect ; \
+	  echo "Done. Now launch \"firefox file://`pwd`/index.html\"" ; \
+	fi
+	mkdir -p stamps
+	touch stamps/plugin-tests.stamp
+
 # jtreg
 
 stamps/jtreg.stamp: stamps/icedtea.stamp
@@ -2225,3 +2256,5 @@ jtreg: stamps/jtreg.stamp
 jtreg: stamps/jtreg.stamp
 
 plugin: $(ICEDTEAPLUGIN_TARGET)
+
+plugin-tests: stamps/plugin-tests.stamp
diff -r 5a04427d184c -r 190eabd599ed NEWS
--- a/NEWS	Tue Jan 26 19:45:53 2010 +0000
+++ b/NEWS	Wed Jan 27 15:36:28 2010 +0000
@@ -1,6 +1,9 @@ New in release 1.7 (XXXX-XX-XX):
 New in release 1.7 (XXXX-XX-XX):
 
 - Updated to OpenJDK6 b17.
+- Alpha version of the new IcedTea NPRuntime based plugin with support for 
+  Firefox >= 3.5, Chromium, and other browsers that support NPRuntime 
+  (use --enable-npplugin to build it).
 - Support added for building with HotSpot 16 using
   --with-hotspot-build=hs16.
 - Zero port updated to match the version submitted to OpenJDK