Changeset 392

Timestamp:

Jul 16, 2012, 2:54:45 PM (13 years ago)

Author:

dmik

Message:

iicedtea-web: More useful defaults for JAVA.EXE and plugin jars.

JAVA.EXE is searched in PATH, plugin jars -- in a dir containing the plugin DLL,
in a subdirectory equal to the plugin DLL base name.

Location:

trunk/icedtea-web

Files:

• Config.kmk (modified) (1 diff)
• plugin/icedteanp/Makefile.kmk (modified) (1 diff)
• plugin/icedteanp/os2/OS_OS2.cc (modified) (3 diffs)

trunk/icedtea-web/Config.kmk

@@ -27 +27 @@
 
 # @todo later
-ICEDTEA_WEB_JRE_DIR     := /@unixroot/usr/lib/jre
-ICEDTEA_WEB_DATA_DIR    := /@unixroot/usr/share/$(PACKAGE_NAME)
+#ICEDTEA_WEB_JRE_DIR     := /@unixroot/usr/lib/jre
+#ICEDTEA_WEB_DATA_DIR    := /@unixroot/usr/share/$(PACKAGE_NAME)
 
 ICEDTEA_WEB_JRE     = icedtea_web_jre_dir()

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

@@ -24 +24 @@
                       -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
                       -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
-                      -DICEDTEA_WEB_JRE_DIR="\"$(ICEDTEA_WEB_JRE_DIR)\"" \
+                      $(if $(ICEDTEA_WEB_JRE_DIR),-DICEDTEA_WEB_JRE_DIR="\"$(ICEDTEA_WEB_JRE_DIR)\"") \
                       -DICEDTEA_WEB_JRE="$(ICEDTEA_WEB_JRE)" \
-                      -DICEDTEA_WEB_DATA_DIR="\"$(ICEDTEA_WEB_DATA_DIR)\"" \
+                      $(if $(ICEDTEA_WEB_DATA_DIR),-DICEDTEA_WEB_DATA_DIR="\"$(ICEDTEA_WEB_DATA_DIR)\"") \
                       -DPLUGIN_BOOTCLASSPATH="$(PLUGIN_BOOTCLASSPATH)"
 npicedt_LIBS        = $(PATH_GLIB_LIBS) pthread

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.cc

@@ -39 +39 @@
 #define INCL_DOS
 #define INCL_PM
+#define INCL_ERRORS
 #include <os2.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "OS_OS2.h"
@@ -50 +52 @@
     const char *home = getenv("ICEDTEA_WEB_DATA");
     if (!home)
+    {
+#if !defined(ICEDTEA_WEB_DATA_DIR)
+        // deduce the path from this DLL's name
+        static char buf[CCHMAXPATH] = {0};
+        if (buf[0] == 0)
+        {
+            BOOL ok = FALSE;
+            HMODULE hmod;
+            ULONG objNum, offset;
+            APIRET rc;
+            rc = DosQueryModFromEIP(&hmod, &objNum, sizeof(buf), buf, &offset,
+                                    (ULONG)&icedtea_web_data_dir);
+            if (rc == NO_ERROR)
+            {
+                rc = DosQueryModuleName(hmod, sizeof(buf), buf);
+                if (rc == NO_ERROR)
+                {
+                    // truncate the extension to get the data dir
+                    char *end = strrchr(buf, '.');
+                    if (end)
+                    {
+                        *end = '\0';
+                        ok = TRUE;
+                    }
+                }
+            }
+            if (!ok)
+                strcpy(buf, ".");
+        }
+        home = buf;
+#else
         home = ICEDTEA_WEB_DATA_DIR;
+#endif
+    }
     return home;
 }
@@ -58 +93 @@
     const char *jre = getenv("ICEDTEA_WEB_JRE");
     if (!jre)
+    {
+#if !defined(ICEDTEA_WEB_JRE_DIR)
+        // deduce the path from JAVA.EXE found in PATH
+        static char buf[CCHMAXPATH] = {0};
+        if (buf[0] == 0)
+        {
+            BOOL ok = FALSE;
+            APIRET rc;
+            rc = DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
+                               SEARCH_CUR_DIRECTORY,
+                               "PATH", "JAVA.EXE", buf, sizeof(buf));
+            if (rc == NO_ERROR)
+            {
+                char *end = strrchr(buf, '\\');
+                if (end)
+                {
+                    *end = '\0';
+                    ok = TRUE;
+                    // truncate \bin if present
+                    end = strrchr(buf, '\\');
+                    if (end && stricmp(end + 1, "bin") == 0)
+                        *end = '\0';
+                }
+            }
+            if (!ok)
+                strcpy(buf, ".");
+        }
+        jre = buf;
+#else
         jre = ICEDTEA_WEB_JRE_DIR;
+#endif
+    }
     return jre;
 }