/hg/icedtea-web: plugin.jar made buildable on windows
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Apr 5 17:20:10 UTC 2017
changeset 5d0a2e26ec43 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=5d0a2e26ec43
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 05 19:29:02 2017 +0200
plugin.jar made buildable on windows
* Makefile.am: (liveconnect-source-files.txt) added sed to source code to use WEmbeddedFrame on windows (based on SUN_AWT_WEMBEDDEDFRAME value)
* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: added warning that base class name is sedded
* acinclude.m4: IT_CHECK_FOR_CLASS got new parameter. If its value is NonFatal, then its absence is only warning
* configure.ac: IT_CHECK_FOR_CLASS SUN_AWT_X11_XEMBEDDEDFRAME made NonFatal, added similar check for SUN_AWT_WEMBEDDEDFRAME. Added checks that exactly one of them exists, otherwise error
diffstat:
ChangeLog | 15 +++++++++++++-
Makefile.am | 6 ++++-
acinclude.m4 | 9 ++++++-
configure.ac | 17 +++++++++++++++-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 1 +
5 files changed, 43 insertions(+), 5 deletions(-)
diffs (114 lines):
diff -r b3d9f5bf15f6 -r 5d0a2e26ec43 ChangeLog
--- a/ChangeLog Wed Apr 05 16:00:22 2017 +0200
+++ b/ChangeLog Wed Apr 05 19:29:02 2017 +0200
@@ -1,3 +1,16 @@
+2017-04-05 Jiri Vanek <jvanek at redhat.com>
+
+ plugin.jar made buildable on windows
+ * Makefile.am: (liveconnect-source-files.txt) added sed to source code to
+ use WEmbeddedFrame on windows (based on SUN_AWT_WEMBEDDEDFRAME value)
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: added warning
+ that base class name is sedded
+ * acinclude.m4: IT_CHECK_FOR_CLASS got new parameter. If its value is
+ NonFatal, then its absence is only warning
+ * configure.ac: IT_CHECK_FOR_CLASS SUN_AWT_X11_XEMBEDDEDFRAME made NonFatal,
+ added similar check for SUN_AWT_WEMBEDDEDFRAME. Added checks that exactly one of them exists,
+ otherwise error
+
2017-04-05 Jiri Vanek <jvanek at redhat.com>
Split ENABLE_PLUGIN to ENABLE_NATIVE_PLUGIN and ENABLE_PLUGINJAR to allow build
@@ -7,7 +20,7 @@
* configure.ac: added check, that native_plugin can not be built without pluginjar
* acinclude.m4: IT_CHECK_PLUGIN and comp. changed to IT_CHECK_NATIVE_PLUGIN and likewise.
Added IT_CHECK_PLUGINJAR to allow user enable/disable plugin completely.
- * .Makefile: following configure changes, ENABLE_PLUGIN renamed/split to
+ * Makefile.am: following configure changes, ENABLE_PLUGIN renamed/split to
ENABLE_NATIVE_PLUGIN and ENABLE_PLUGINJAR
all testsuites keep running with --disable-native_plugin. Not so with disabled plugin completely
diff -r b3d9f5bf15f6 -r 5d0a2e26ec43 Makefile.am
--- a/Makefile.am Wed Apr 05 16:00:22 2017 +0200
+++ b/Makefile.am Wed Apr 05 19:29:02 2017 +0200
@@ -485,7 +485,11 @@
liveconnect-source-files.txt:
if test "x${LIVECONNECT_DIR}" != x; then \
find $(LIVECONNECT_SRCS) -name '*.java' | sort > $@ ; \
- fi
+ fi ; \
+ 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 ; \
+ fi ; \
touch $@
stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
diff -r b3d9f5bf15f6 -r 5d0a2e26ec43 acinclude.m4
--- a/acinclude.m4 Wed Apr 05 16:00:22 2017 +0200
+++ b/acinclude.m4 Wed Apr 05 19:29:02 2017 +0200
@@ -476,7 +476,7 @@
AC_DEFUN([IT_CHECK_FOR_CLASS],[
AC_REQUIRE([IT_FIND_JAVAC])
AC_REQUIRE([IT_FIND_JAVA])
-AC_CACHE_CHECK([if $2 is available], it_cv_$1, [
+AC_CACHE_CHECK([if $2 is available from $3 (module "$4") as $5], it_cv_$1, [
# first is the variableto save in, second param is name of class to find,
# third is name of package to make check in.
# mostly some.pkg is ok, but some tests must bedone in sun.applet or other special directory
@@ -522,8 +522,13 @@
# should be rmdir but has to be rm -rf due to sun.applet usage
rm -rf tmp.$$
if test x"${it_cv_$1}" = "xno"; then
- AC_MSG_ERROR([$2 not found.])
+ if test x$5 = xNonFatal; then
+ AC_MSG_WARN([$2 not found.])
+ else
+ AC_MSG_ERROR([$2 not found.])
+ fi
fi
+AC_SUBST([$1], [${it_cv_$1}])
AC_PROVIDE([$0])dnl
])
diff -r b3d9f5bf15f6 -r 5d0a2e26ec43 configure.ac
--- a/configure.ac Wed Apr 05 16:00:22 2017 +0200
+++ b/configure.ac Wed Apr 05 19:29:02 2017 +0200
@@ -97,11 +97,26 @@
IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER, [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE, [sun.net.www.protocol.jar.URLJarFile], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK, [sun.net.www.protocol.jar.URLJarFileCallBack], [some.pkg], [$JAVA_BASE])
-IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame], [some.pkg], [$JAVA_DESKTOP])
+IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame], [some.pkg], [$JAVA_DESKTOP], [NonFatal])
+IT_CHECK_FOR_CLASS(SUN_AWT_WEMBEDDEDFRAME, [sun.awt.windows.WEmbeddedFrame], [some.pkg], [$JAVA_DESKTOP], [NonFatal])
IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil], [some.pkg], [$JAVA_NAMING])
IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_HTTP_HANDLER, [sun.net.www.protocol.http.Handler], [some.pkg], [$JAVA_BASE])
IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP])
+# you can see checks for embedded frame are NonFatal. We wont exactly one of them
+if test x$SUN_AWT_X11_XEMBEDDEDFRAME = xyes -a x$SUN_AWT_WEMBEDDEDFRAME = xyes ; then
+ AC_MSG_ERROR([Your jdk have both X11 and Windows EmbeddedFrame])
+fi
+if test x$SUN_AWT_X11_XEMBEDDEDFRAME = xno -a x$SUN_AWT_WEMBEDDEDFRAME = xno ; then
+ AC_MSG_ERROR([Your jdk have non of X11 or Windows EmbeddedFrame])
+fi
+if test x$SUN_AWT_X11_XEMBEDDEDFRAME = xyes ; then
+ AC_MSG_RESULT([using X11 EmbeddedFrame])
+fi
+if test x$SUN_AWT_WEMBEDDEDFRAME = xyes ; then
+ AC_MSG_RESULT([using Windows EmbeddedFrame])
+fi
+
IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY
IT_CHECK_GLIB_VERSION
IT_CHECK_XULRUNNER_MIMEDESCRIPTION_CONSTCHAR
diff -r b3d9f5bf15f6 -r 5d0a2e26ec43 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Apr 05 16:00:22 2017 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed Apr 05 19:29:02 2017 +0200
@@ -120,6 +120,7 @@
import sun.awt.X11.XEmbeddedFrame;
/*
+ * Waring! Warious EmbeddedFrames are sedded during windows builds!
*/
// FIXME: declare JSProxy implementation
@SuppressWarnings("serial")
More information about the distro-pkg-dev
mailing list