Bug 322727 - JavaXPCOM on OS/2. patch by abwillis, r=jhpedemonte/mkaply. XULRunner only.

extensions/java/xpcom/glue/Makefile.in

@@ -44,6 +44,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= javaxpcomglue
 LIBRARY_NAME	= javaxpcomglue
+ifeq ($(OS_ARCH),OS2)
+SHORT_LIBNAME	= jxpcmglu
+endif
 
 # On Mac OS X, JNI libraries must end with a '.jnilib' extension
 ifeq ($(OS_ARCH),Darwin)
@@ -59,8 +62,12 @@ LOCAL_INCLUDES	= -I$(JAVA_INCLUDE_PATH)
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
 else
+ifeq ($(OS_ARCH),OS2)
+LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/OS2
+else
 LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
 endif
+endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 

extensions/java/xpcom/src/Makefile.in

@@ -69,8 +69,12 @@ LOCAL_INCLUDES	= -I$(JAVA_INCLUDE_PATH)
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
 else
+ifeq ($(OS_ARCH),OS2)
+LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/OS2
+else
 LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
 endif
+endif
 
 # Don't set JAVA_LIBRARY_NAME, since we don't want to build during 'libs'
 # stage, but rather when explicitly called.

extensions/java/xpcom/src/org/mozilla/xpcom/internal/JavaXPCOMMethods.java

@@ -47,7 +47,13 @@ public class JavaXPCOMMethods {
     if (aLibXULDirectory != null) {
       path = aLibXULDirectory + File.separator;
     }
-    System.load(path + System.mapLibraryName("javaxpcomglue"));
+
+    String osName = System.getProperty("os.name").toLowerCase();
+    if (osName.startsWith("os/2")) {
+      System.load(path + System.mapLibraryName("jxpcmglu"));
+    } else {
+      System.load(path + System.mapLibraryName("javaxpcomglue"));
+    }
 
     registerJavaXPCOMMethodsNative(aLibXULDirectory);
   }

extensions/java/xpcom/tests/Makefile.in

@@ -61,7 +61,7 @@ JAVA_SRCS = \
 
 DIRS += dll
 
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
 SEP = \;
 else
 SEP = :