Changeset 357

Timestamp:

Apr 26, 2012, 10:51:16 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Port plugin to OS/2.

Location:

trunk/icedtea-web

Files:

• Config.kmk (modified) (3 diffs)
• extra/OS.cc (added)
• extra/OS.h (added)
• plugin/icedteanp/IcedTeaJavaRequestProcessor.cc (modified) (1 diff)
• plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (8 diffs)
• plugin/icedteanp/IcedTeaNPPlugin.h (modified) (1 diff)
• plugin/icedteanp/IcedTeaPluginUtils.cc (modified) (1 diff)
• plugin/icedteanp/Makefile.kmk (modified) (2 diffs)

trunk/icedtea-web/Config.kmk

@@ -16 +16 @@
 IT_LANGUAGE_SOURCE_VERSION := 6
 IT_CLASS_TARGET_VERSION    := 6
-IT_JAVAC_SETTINGS           = -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-IT_JAVACFLAGS               = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
+IT_JAVAC_SETTINGS          ?= -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
+IT_JAVACFLAGS              ?= $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
 
-BOOTSTRAP_JDK_RUNTIME   = $(PATH_BOOTSTRAP_JDK)/jre/lib/rt.jar;$(PATH_BOOTSTRAP_JDK)/jre/lib/jsse.jar
+BOOTSTRAP_JDK_RUNTIME  ?= $(PATH_BOOTSTRAP_JDK)/jre/lib/rt.jar;$(PATH_BOOTSTRAP_JDK)/jre/lib/jsse.jar
 
-NETX_RESOURCE_DIR       = $(PATH_ROOT)/netx/net/sourceforge/jnlp/resources
+INSTALL_DATA       := install -m 644
 
-INSTALL_DATA       := $(INSTALL) -m 644
+# @todo later
+ICEDTEA_WEB_JRE_DIR     := /@unixroot/usr/lib/jre
+ICEDTEA_WEB_DATA_DIR    := /@unixroot/usr/share/$(PACKAGE_NAME)
+
+ICEDTEA_WEB_JRE     = icedtea_web_jre_dir()
 
 #
@@ -32 +36 @@
 #  - we want full privileges
 #
-LAUNCHER_BOOTCLASSPATH  = -Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)
-PLUGIN_BOOTCLASSPATH    = -Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar;$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)
+LAUNCHER_BOOTCLASSPATH  = \"-Xbootclasspath/a:%s/netx.jar$(RHINO_RUNTIME)\", \
+                          icedtea_web_data_dir()
+PLUGIN_BOOTCLASSPATH    = \"-Xbootclasspath/a:%s/netx.jar;%s/plugin.jar$(RHINO_RUNTIME)\", \
+                          icedtea_web_data_dir()
 
 # Fake update version to work with the Deployment Toolkit script used by Oracle
@@ -86 +92 @@
 MOZILLA_VERSION_COLLAPSED  ?= 11000000 # 11.0.0.0
 
-PATH_GLIB_INCS             ?= $(patsubst -I%,%,$(shell pkg-config --cflags-only-I glib-2.0))
-PATH_GLIB_LIBS             ?= $(patsubst -l%,%,$(shell pkg-config --libs-only-l glib-2.0))
-PATH_GLIB_LIBPATH          ?= $(patsubst -L%,%,$(shell pkg-config --libs-only-L glib-2.0))
+PATH_GLIB_INCS             ?= $(patsubst -I%,%,$(shell pkg-config --cflags-only-I glib-2.0 gthread-2.0))
+PATH_GLIB_LIBS             ?= $(patsubst -l%,%,$(shell pkg-config --libs-only-l glib-2.0 gthread-2.0))
+PATH_GLIB_LIBPATH          ?= $(patsubst -L%,%,$(shell pkg-config --libs-only-L glib-2.0 gthread-2.0))

trunk/icedtea-web/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc

@@ -36 +36 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
+
+#ifdef __EMX__
+#include <unistd.h> // usleep
+#endif
 
 #include <typeinfo>

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -37 +37 @@
 exception statement from your version. */
 
+#ifdef __OS2__
+// OS/2 includes.
+#define INCL_PM
+#include <os2.h>
+#endif
+
 // System includes.
 #include <dlfcn.h>
@@ -51 +57 @@
 #include "IcedTeaScriptablePluginObject.h"
 #include "IcedTeaNPPlugin.h"
+
+#include "OS.h"
 
 #if MOZILLA_VERSION_COLLAPSED < 1090100
@@ -1079 +1087 @@
 plugin_display_failure_dialog ()
 {
+#ifdef __OS2__
+  gchar *msg = NULL;
+
+  PLUGIN_DEBUG ("plugin_display_failure_dialog\n");
+
+  msg = g_strdup_printf (FAILURE_MESSAGE, appletviewer_executable);
+  WinMessageBox (HWND_DESKTOP, HWND_DESKTOP,
+                 msg, "Error", 0, MB_ERROR | MB_OK);
+  g_free(msg);
+#else
   GtkWidget* dialog = NULL;
 
@@ -1092 +1110 @@
   gtk_dialog_run (GTK_DIALOG (dialog));
   gtk_widget_destroy (dialog);
+#endif
 
   PLUGIN_DEBUG ("plugin_display_failure_dialog return\n");
@@ -1534 +1553 @@
       command_line = (gchar**) malloc(sizeof(gchar*)*11);
       command_line[cmd_num++] = g_strdup(appletviewer_executable);
-      command_line[cmd_num++] = g_strdup(PLUGIN_BOOTCLASSPATH);
+      command_line[cmd_num++] = g_strdup_printf(PLUGIN_BOOTCLASSPATH);
       // set the classpath to avoid using the default (cwd).
       command_line[cmd_num++] = g_strdup("-classpath");
@@ -1555 +1574 @@
       command_line = (gchar**) malloc(sizeof(gchar*)*8);
       command_line[cmd_num++] = g_strdup(appletviewer_executable);
-      command_line[cmd_num++] = g_strdup(PLUGIN_BOOTCLASSPATH);
+      command_line[cmd_num++] = g_strdup_printf(PLUGIN_BOOTCLASSPATH);
       command_line[cmd_num++] = g_strdup("-classpath");
       command_line[cmd_num++] = g_strdup_printf("%s/lib/rt.jar", ICEDTEA_WEB_JRE);
@@ -2263 +2282 @@
 // Returns a string describing the MIME type that this plugin
 // handles.
-char*
+const char*
 NP_GetMIMEDescription ()
 {
@@ -2270 +2289 @@
   PLUGIN_DEBUG ("NP_GetMIMEDescription return\n");
 
-  return (char*) PLUGIN_MIME_DESC;
+  return PLUGIN_MIME_DESC;
 }
 

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.h

@@ -52 +52 @@
 #include <glib/gstdio.h>
 
+#ifndef __OS2__
 // GTK includes.
 #include <gtk/gtk.h>
+#endif
 
 #include "IcedTeaPluginUtils.h"

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginUtils.cc

@@ -36 +36 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
+
+#ifdef __EMX__
+#include <unistd.h> // usleep
+#endif
 
 #include "IcedTeaNPPlugin.h"

trunk/icedtea-web/plugin/icedteanp/Makefile.kmk

@@ -7 +7 @@
 DLLS               += npicedt
 npicedt_TEMPLATE    = Cxx
-npicedt_INCS        = $(PATH_MOZILLA_INCS) $(PATH_GLIB_INCS)
-npicedt_DEFS        = JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION) \
-                      MOZILLA_VERSION_COLLAPSED=$(MOZILLA_VERSION_COLLAPSED)
-npicedt_CXXFLAGS    = -DPLUGIN_NAME="IcedTea-Web Plugin" \
-                      -DPLUGIN_VERSION="IcedTea-Web $(FULL_VERSION)" \
-                      -DPACKAGE_URL="$(PACKAGE_URL)" \
-                      -DICEDTEA_WEB_JRE="$(SYSTEM_JRE_DIR)" \
+npicedt_INCS        = $(PATH_ROOT)/extra $(PATH_MOZILLA_INCS) $(PATH_GLIB_INCS)
+npicedt_DEFS        = MOZILLA_VERSION_COLLAPSED=$(MOZILLA_VERSION_COLLAPSED) \
+                      DETECT_DATA_DIR=$(DETECT_DATA_DIR) \
+                      DETECT_JRE_DIR=$(DETECT_JRE_DIR) \
+                      WITHOUT_GTK
+npicedt_CXXFLAGS    = -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
+                      -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
+                      -DPLUGIN_VERSION="\"IcedTea-Web $(FULL_VERSION)\"" \
+                      -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
+                      -DICEDTEA_WEB_JRE_DIR="\"$(SYSTEM_JRE_DIR)\"" \
+                      -DICEDTEA_WEB_JRE="$(ICEDTEA_WEB_JRE)" \
+                      -DICEDTEA_WEB_DATA_DIR="\"$(ICEDTEA_WEB_DATA_DIR)\"" \
                       -DPLUGIN_BOOTCLASSPATH="$(PLUGIN_BOOTCLASSPATH)"
-npicedt_LIBS        = $(PATH_GLIB_LIBS)
+npicedt_LIBS        = $(PATH_GLIB_LIBS) pthread
 npicedt_LIBPATH     = $(PATH_GLIB_LIBPATH)
 
@@ -23 +28 @@
     IcedTeaJavaRequestProcessor.cc \
     IcedTeaPluginRequestProcessor.cc \
-    IcedTeaPluginUtils.cc
+    IcedTeaPluginUtils.cc \
+    $(PATH_ROOT)/extra/OS.cc
 
 # Unsorted stuff from Makefile.in