Changeset 71 for trunk

Timestamp:

Jul 19, 2010, 11:01:13 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Added support for OS/2 to the java.dll makefile.

File:

• trunk/openjdk/jdk/make/java/java/Makefile (modified) (13 diffs)

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

@@ -46 +46 @@
 endif
 
+ifeq ($(PLATFORM),os2)
+
+# build directly into BINDIR...
+LIB_LOCATION = $(BINDIR)
+
+# exports live in .def file
+DEF_FILE = $(OBJDIR)/$(LIBRARY).def
+
+$(DEF_FILE): $(MAKEFILE)
+        $(ECHO) -e 'EXPORTS ; $(MAKEFILE)\n \
+  _winFileHandleOpen \n \
+  _handleLseek \n \
+' > $@
+
+clean::
+        -$(RM) $(DEF_FILE)
+
+endif
+
 OTHER_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
                 -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
                 -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
-                -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' 
+                -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
 
 ifdef JDK_UPDATE_VERSION
@@ -63 +82 @@
 include Exportedfiles.gmk
 
-ifeq ($(PLATFORM),windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 FILES_java +=   java/io/Win32FileSystem.java \
                 java/io/WinNTFileSystem.java \
@@ -167 +186 @@
 # Is the altzone extern documented in ctime(3C) available?
 #
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
 HAVE_ALTZONE=true
 endif
@@ -206 +225 @@
                        -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
 else
+ifeq ($(PLATFORM),os2)
+OTHER_LDLIBS += $(JVMLIB) -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
+                       -L$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+else
 OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
                 -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+endif
 endif
 
@@ -237 +261 @@
 endif
 
-ifneq ($(PLATFORM),windows)
+ifneq ($(filter-out windows os2, $(PLATFORM)),)
 
 # UNIXProcess.java is different for solaris and linux. We need to copy
@@ -246 +270 @@
         $(install-file)
 
-clean:: 
+clean::
         $(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java
 
@@ -260 +284 @@
 # Special rules.
 #
-clean:: 
+clean::
         $(RM) -r $(CLASSHDRDIR)
 
-clobber:: 
+clobber::
         $(RM) -r $(CLASSBINDIR)/java/io $(CLASSBINDIR)/java/lang \
                 $(CLASSBINDIR)/java/security $(CLASSBINDIR)/java/util \
@@ -282 +306 @@
 # Rule to copy tzmappings file on Windows
 #
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 TZMAP = $(LIBDIR)/tzmappings
 TZMAPFILE = $(PLATFORM_SRC)/lib/tzmappings
@@ -299 +323 @@
         $(install-file)
 
-clean:: 
+clean::
         $(RM) -r $(LIBDIR)/$(PROPS) $(TZMAP)
 
@@ -320 +344 @@
         $(CHMOD) 444 $@
 
-clean:: 
+clean::
         $(RM) $(CURDATA)
 
 
 #
-# Rules to create $(GENSRCDIR)/sun/lang/CharacterData*.java 
+# Rules to create $(GENSRCDIR)/sun/lang/CharacterData*.java
 #
 CHARACTERDATA = $(BUILDDIR)/tools/GenerateCharacter
@@ -375 +399 @@
 
 clean::
-        $(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java 
+        $(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java
         $(RM) $(GENSRCDIR)/java/lang/CharacterData00.java
-        $(RM) $(GENSRCDIR)/java/lang/CharacterData01.java 
+        $(RM) $(GENSRCDIR)/java/lang/CharacterData01.java
         $(RM) $(GENSRCDIR)/java/lang/CharacterData02.java
         $(RM) $(GENSRCDIR)/java/lang/CharacterData0E.java
-        $(RM) $(GENSRCDIR)/java/lang/CharacterDataUndefined.java 
+        $(RM) $(GENSRCDIR)/java/lang/CharacterDataUndefined.java
         $(RM) $(GENSRCDIR)/java/lang/CharacterDataPrivateUse.java
 
@@ -388 +412 @@
 
 #
-# Rule to precompile CoreResourceBundleControl.java 
+# Rule to precompile CoreResourceBundleControl.java
 #
 LOCALES_GEN_SH = localelist.sh
@@ -394 +418 @@
 $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \
         $(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java $(LOCALES_GEN_SH)
-        @$(prep-target) 
+        @$(prep-target)
         NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \
-                $< $@ 
+                $< $@
 clean::
         $(RM) $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java