Mercurial > hg > release > icedtea6-1.8
changeset 1853:80b2080f8c91
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, 27 Jan 2010 15:35:17 +0000 |
| parents | a82258f09fae |
| children | 4e7e38a0c858 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 40 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 26 19:45:53 2010 +0000 +++ b/ChangeLog Wed Jan 27 15:35:17 2010 +0000 @@ -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-25 Andrew John Hughes <ahughes@redhat.com> * acinclude.m4:
--- a/Makefile.am Tue Jan 26 19:45:53 2010 +0000 +++ b/Makefile.am Wed Jan 27 15:35:17 2010 +0000 @@ -191,6 +191,10 @@ ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea endif +# Sources list + +PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java + # Patch list ICEDTEA_FSG_PATCHES = @@ -1895,6 +1899,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 @@ -2228,3 +2259,5 @@ jtreg: stamps/jtreg.stamp plugin: $(ICEDTEAPLUGIN_TARGET) + +plugin-tests: stamps/plugin-tests.stamp