/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset 20b4d1ce80b9 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=20b4d1ce80b9
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 06 11:02:46 2017 +0200

	Makefile.am - hopefully fixed issue with multiple regexes in whitelist


changeset e99e879a68c8 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e99e879a68c8
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 06 12:37:55 2017 +0200

	Makefile.am: for windows build, sed PluginAppletViewer's super call


diffstat:

 ChangeLog   |   4 ++++
 Makefile.am |  10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r 5d0a2e26ec43 -r e99e879a68c8 ChangeLog
--- a/ChangeLog	Wed Apr 05 19:29:02 2017 +0200
+++ b/ChangeLog	Thu Apr 06 12:37:55 2017 +0200
@@ -1,3 +1,7 @@
+2017-04-06  Jiri Vanek <jvanek at redhat.com>
+
+	* Makefile.am: for windows build, sed PluginAppletViewer's super call
+
 2017-04-05  Jiri Vanek <jvanek at redhat.com>
 
 	plugin.jar made buildable on windows
diff -r 5d0a2e26ec43 -r e99e879a68c8 Makefile.am
--- a/Makefile.am	Wed Apr 05 19:29:02 2017 +0200
+++ b/Makefile.am	Thu Apr 06 12:37:55 2017 +0200
@@ -489,6 +489,7 @@
 	if test x$(SUN_AWT_WEMBEDDEDFRAME) = xyes ; then \
 	  sed "s;sun.awt.X11.XEmbeddedFrame;sun.awt.windows.WEmbeddedFrame;" -i $(LIVECONNECT_SRCS)/$(SUN_APPLET_DIRS)/PluginAppletViewer.java ; \
 	  sed "s;XEmbeddedFrame;WEmbeddedFrame;" -i $(LIVECONNECT_SRCS)/$(SUN_APPLET_DIRS)/PluginAppletViewer.java ; \
+	  sed "s;super(handle, true);super(handle);" -i $(LIVECONNECT_SRCS)/$(SUN_APPLET_DIRS)/PluginAppletViewer.java ; \
 	fi ; \
 	touch $@
 
@@ -818,23 +819,26 @@
 	touch $@
 
 junit-jnlp-dist-custom.txt:
+	rm -f $(abs_top_builddir)/$@ ; \
 	cd $(REPRODUCERS_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
 	for x in $(COMPILE_WHITELIST_FILTER) ; do \
-	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x > $(abs_top_builddir)/$@ || true ; \
+	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x >> $(abs_top_builddir)/$@ || true ; \
 	done
 
 junit-jnlp-dist-simple.txt:
+	rm -f $(abs_top_builddir)/$@ ; \
 	cd $(REPRODUCERS_TESTS_SRCDIR)/simple/ ; \
 	for x in $(COMPILE_WHITELIST_FILTER) ; do \
-	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x > $(abs_top_builddir)/$@ || true ; \
+	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x >> $(abs_top_builddir)/$@ || true ; \
 	done
 
 stamps/junit-jnlp-dist-signed.stamp:
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
+	  rm -f $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
 	  pushd $(REPRODUCERS_TESTS_SRCDIR)/$$which/ ; \
 	    for x in $(COMPILE_WHITELIST_FILTER) ; do \
-	      find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
+	      find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x >> $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
 	    done ; \
 	  popd ; \
 	done ; \