/hg/icedtea: 3 new changesets

[andrew at icedtea.classpath.org]

changeset a162d147953c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a162d147953c
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 21:52:19 2010 +0000

	Fix trailing space after plugin version when pkgversion not set.

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

	 * Makefile.am: Remove trailing space after IcedTea
	version in plugin version information when package
	version is not set.


changeset fdf0c004a607 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fdf0c004a607
author: doko at ubuntu.com
date: Wed Jan 27 13:16:02 2010 +0100

	Fix quoting of ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG

	If these macros need quoting, quoting has to be done in the places
	where it is needed, else PLUGIN_VERSION gets wrong.

	2010-01-27 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
	ICEDTEA_PKG.


changeset 962e6e2b70f5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=962e6e2b70f5
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 19 17:34:15 2010 +0100

	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.


diffstat:

2 files changed, 55 insertions(+), 4 deletions(-)
ChangeLog   |   18 ++++++++++++++++++
Makefile.am |   41 +++++++++++++++++++++++++++++++++++++----

diffs (102 lines):

diff -r a8b1c8bb75b9 -r 962e6e2b70f5 ChangeLog
--- a/ChangeLog	Tue May 18 15:12:38 2010 +0100
+++ b/ChangeLog	Wed May 19 17:34:15 2010 +0100
@@ -1,3 +1,21 @@ 2010-05-18 Andrew John Hughes  <ahughes@
+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-27  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Remove trailing space after IcedTea version
+	in plugin version information when package
+	version is not set.
+	
 2010-05-18 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/boot/scanner-charsets.patch:
diff -r a8b1c8bb75b9 -r 962e6e2b70f5 Makefile.am
--- a/Makefile.am	Tue May 18 15:12:38 2010 +0100
+++ b/Makefile.am	Wed May 19 17:34:15 2010 +0100
@@ -254,6 +254,10 @@ OPENJDK_TREE = stamps/overlay.stamp
 # is available in $(abs_top_builddir)/openjdk-boot
 OPENJDK_BOOT_TREE = stamps/patch-boot.stamp
 
+# Sources list
+
+PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
+
 # Patch list
 
 ICEDTEA_PATCHES = \
@@ -456,15 +460,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="IcedTea7"
+ICEDTEA_NAME = IcedTea7
 if HAS_ICEDTEA_REVISION
-ICEDTEA_REV="+${ICEDTEA_REVISION}"
+ICEDTEA_REV = +${ICEDTEA_REVISION}
 endif
 if HAS_PKGVERSION
-ICEDTEA_PKG="(${PKGVERSION})"
+ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
 endif
 
-PLUGIN_VERSION=$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV) $(ICEDTEA_PKG)
+PLUGIN_VERSION = $(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
 
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(ICEDTEA_BOOT_DIR)" \
@@ -2507,6 +2511,33 @@ clean-add-zero-debug:
 
 # 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
@@ -2752,6 +2783,8 @@ patch-fsg: stamps/patch-fsg.stamp
 
 plugin: stamps/plugin.stamp
 
+plugin-tests: stamps/plugin-tests.stamp
+
 plugs: stamps/plugs.stamp
 
 pulse-java: stamps/pulse-java.stamp