Changeset 87

Timestamp:

Aug 4, 2010, 10:36:04 PM (15 years ago)

Author:

dmik

Message:

jdk/src: Adopted jli.dll to OS/2.

Location:

trunk/openjdk/jdk

Files:

• make/java/jli/Makefile (modified) (3 diffs)
• src/share/bin/parse_manifest.c (modified) (1 diff)
• src/share/bin/wildcard.c (modified) (1 diff)

trunk/openjdk/jdk/make/java/jli/Makefile

@@ -97 +97 @@
 endif
 
+ifeq ($(PLATFORM), os2)
+
+EXTRA_LIBS =
+JAVALIB =
+
+# exports live in .def file
+DEF_FILE = $(OBJDIR)/$(LIBRARY).def
+$(DEF_FILE): $(MAKEFILE)
+        @$(ECHO) 'EXPORTS \n \
+  JLI_ParseManifest = _JLI_ParseManifest \n \
+  JLI_JarUnpackFile = _JLI_JarUnpackFile \n \
+  JLI_FreeManifest = _JLI_FreeManifest \n \
+  JLI_ManifestIterate = _JLI_ManifestIterate \n \
+  JLI_ExactVersionId = _JLI_ExactVersionId \n \
+  JLI_PrefixVersionId = _JLI_PrefixVersionId \n \
+  JLI_AcceptableRelease = _JLI_AcceptableRelease \n \
+  JLI_ValidVersionString = _JLI_ValidVersionString \n \
+  JLI_WildcardExpandClasspath = _JLI_WildcardExpandClasspath \n \
+  JLI_MemAlloc = _JLI_MemAlloc \n \
+  JLI_MemRealloc = _JLI_MemRealloc \n \
+  JLI_StringDup = _JLI_StringDup \n \
+  JLI_MemFree = _JLI_MemFree \n \
+' > $@
+
+clean::
+        -$(RM) $(DEF_FILE)
+
+endif
+
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
 OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
@@ -117 +146 @@
 # the build process.  The import library is built by the standard rules
 # in Library.gmk.  The additional rules which follow build the standard
-# library.
+# library.  The same thing should be done on OS/2.
 #
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 
 STATIC_LIBRARY_DIR = $(OBJDIR)/static
@@ -131 +160 @@
 $(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
         @$(prep-target)
+ifeq ($(PLATFORM), windows)
         $(LIBEXE) -nologo -out:$@ $(FILES_o)
+else
+        $(AR) r $@ $(FILES_o)
+endif
 
 library:: $(STATIC_LIBRARY)

trunk/openjdk/jdk/src/share/bin/parse_manifest.c

@@ -35 +35 @@
  * POSIX says it should be?
  */
-#ifdef _WIN32
+#if defined(_WIN32)
 #include <windows.h>
 #include <io.h>
+#elif defined(__WIN32OS2__)
+#include <windows.h>
+#ifdef __EMX__
+#include <unistd.h>
+#include <strings.h>
+#endif
 #else   /* Unix */
 #include <unistd.h>

trunk/openjdk/jdk/src/share/bin/wildcard.c

@@ -94 +94 @@
 #include "jli_util.h"
 
-#ifdef _WIN32
+#if defined(_WIN32)
 #include <windows.h>
+#elif defined(__WIN32OS2__)
+#include <windows.h>
+#ifdef __EMX__
+#include <unistd.h>
+#include <dirent.h>
+#endif
 #else /* Unix */
 #include <unistd.h>