/hg/icedtea-web: better handling of WEmbeddedFrame/XEmbeddedFrame
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Apr 10 12:35:47 UTC 2017
changeset 233e93731f1e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=233e93731f1e
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Apr 10 14:44:43 2017 +0200
better handling of WEmbeddedFrame/XEmbeddedFrame
* configure.ac: IT_CHECK_FOR_CLASS removed NonFatal support check for WEmbeddedFrame/XEmbeddedFrame done by windows/linux recognition removed checks on SUN_AWT_X11_XEMBEDDEDFRAME and SUN_AWT_WEMBEDDEDFRAME
* Makefile.am: sed in PluginAppletViewer.java conditioned by WINDOWS variable isntead of SUN_AWT_WEMBEDDEDFRAME one
diffstat:
ChangeLog | 9 +++++++++
Makefile.am | 13 ++++++++-----
acinclude.m4 | 8 ++------
configure.ac | 22 ++++++----------------
4 files changed, 25 insertions(+), 27 deletions(-)
diffs (103 lines):
diff -r cd4cbbbc6e31 -r 233e93731f1e ChangeLog
--- a/ChangeLog Mon Apr 10 13:44:10 2017 +0200
+++ b/ChangeLog Mon Apr 10 14:44:43 2017 +0200
@@ -1,3 +1,12 @@
+2017-04-10 Jiri Vanek <jvanek at redhat.com>
+
+ better handling of WEmbeddedFrame/XEmbeddedFrame
+ * configure.ac: IT_CHECK_FOR_CLASS removed NonFatal support
+ check for WEmbeddedFrame/XEmbeddedFrame done by windows/linux recognition
+ removed checks on SUN_AWT_X11_XEMBEDDEDFRAME and SUN_AWT_WEMBEDDEDFRAME
+ * Makefile.am: sed in PluginAppletViewer.java conditioned
+ by WINDOWS variable isntead of SUN_AWT_WEMBEDDEDFRAME one
+
2017-04-10 Michal Vala <mvala at redhat.com>
Jiri Vanek <jvanek at redhat.com>
diff -r cd4cbbbc6e31 -r 233e93731f1e Makefile.am
--- a/Makefile.am Mon Apr 10 13:44:10 2017 +0200
+++ b/Makefile.am Mon Apr 10 14:44:43 2017 +0200
@@ -494,14 +494,17 @@
rm -f stamps/plugin.stamp
liveconnect-source-files.txt:
+if WINDOWS
+ echo "Using WEmbeddedFrame" ; \
+ 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 ;
+else
+ echo "Using XEmbeddedFrame" ;
+endif
if test "x${LIVECONNECT_DIR}" != x; then \
find $(LIVECONNECT_SRCS) -name '*.java' | sort > $@ ; \
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 ; \
- sed "s;super(handle, true);super(handle);" -i $(LIVECONNECT_SRCS)/$(SUN_APPLET_DIRS)/PluginAppletViewer.java ; \
- fi ; \
touch $@
stamps/liveconnect.stamp: liveconnect-source-files.txt stamps/netx.stamp
diff -r cd4cbbbc6e31 -r 233e93731f1e acinclude.m4
--- a/acinclude.m4 Mon Apr 10 13:44:10 2017 +0200
+++ b/acinclude.m4 Mon Apr 10 14:44:43 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 from $3 (module "$4") as $5], it_cv_$1, [
+AC_CACHE_CHECK([if $2 is available from $3 (module "$4")], 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,11 +522,7 @@
# 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
- if test x$5 = xNonFatal; then
- AC_MSG_WARN([$2 not found.])
- else
- AC_MSG_ERROR([$2 not found.])
- fi
+ AC_MSG_ERROR([$2 not found.])
fi
AC_SUBST([$1], [${it_cv_$1}])
AC_PROVIDE([$0])dnl
diff -r cd4cbbbc6e31 -r 233e93731f1e configure.ac
--- a/configure.ac Mon Apr 10 13:44:10 2017 +0200
+++ b/configure.ac Mon Apr 10 14:44:43 2017 +0200
@@ -113,26 +113,16 @@
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], [NonFatal])
-IT_CHECK_FOR_CLASS(SUN_AWT_WEMBEDDEDFRAME, [sun.awt.windows.WEmbeddedFrame], [some.pkg], [$JAVA_DESKTOP], [NonFatal])
+if test "x$build_linux" = xyes ; then
+ IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame], [some.pkg], [$JAVA_DESKTOP])
+fi
+if test "x$build_windows" = xyes ; then
+ IT_CHECK_FOR_CLASS(SUN_AWT_WEMBEDDEDFRAME, [sun.awt.windows.WEmbeddedFrame], [some.pkg], [$JAVA_DESKTOP])
+fi
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
More information about the distro-pkg-dev
mailing list