Mercurial > hg > release > icedtea7-2.0
changeset 2157:962e6e2b70f5
Add a target for building the plugin tests.
2010-01-26 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(stamps/plugin-tests.stamp): Add
a target for building the plugin tests.
(plugin-tests): Alias for the above.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 19 May 2010 17:34:15 +0100 |
| parents | fdf0c004a607 |
| children | 40357adde7f6 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 40 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jan 27 13:16:02 2010 +0100 +++ b/ChangeLog Wed May 19 17:34:15 2010 +0100 @@ -1,3 +1,10 @@ +2010-01-26 Andrew John Hughes <ahughes@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@ubuntu.com> * Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV ICEDTEA_PKG.
--- a/Makefile.am Wed Jan 27 13:16:02 2010 +0100 +++ b/Makefile.am Wed May 19 17:34:15 2010 +0100 @@ -254,6 +254,10 @@ # 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 = \ @@ -2507,6 +2511,33 @@ # 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 @@ plugin: stamps/plugin.stamp +plugin-tests: stamps/plugin-tests.stamp + plugs: stamps/plugs.stamp pulse-java: stamps/pulse-java.stamp