Changeset 101 for trunk/openjdk/jdk/make

Timestamp:

Aug 14, 2010, 7:50:26 PM (15 years ago)

Author:

dmik

Message:

jdk: Ported net.dll to OS/2.

Location:

trunk/openjdk/jdk/make/java/net

Files:

• FILES_c.gmk (modified) (2 diffs)
• Makefile (modified) (5 diffs)

trunk/openjdk/jdk/make/java/net/FILES_c.gmk

@@ -44 +44 @@
 endif
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),) 
+ifeq ($(PLATFORM), windows) 
     FILES_c += TwoStacksPlainSocketImpl.c
     FILES_c += DualStackPlainSocketImpl.c
@@ -50 +50 @@
     FILES_c += DualStackPlainDatagramSocketImpl.c
 else
+ifeq ($(PLATFORM), os2) 
+    FILES_c += TwoStacksPlainSocketImpl.c
+    FILES_c += TwoStacksPlainDatagramSocketImpl.c
+else
     FILES_c += PlainSocketImpl.c
     FILES_c += PlainDatagramSocketImpl.c
 endif
+endif
 

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

@@ -37 +37 @@
 AUTO_FILES_JAVA_DIRS = java/net
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),) 
+ifeq ($(PLATFORM), windows) 
     # Windows 9x module only needed on 32-bit build
     ifeq ($(ARCH_DATA_MODEL), 32)
@@ -44 +44 @@
     FILES_c += NTLMAuthSequence.c
     FILES_c += NetworkInterface_winXP.c
+endif
+
+ifeq ($(PLATFORM), os2) 
+    FILES_c += NTLMAuthSequence.c
 endif
 
@@ -72 +76 @@
     sun/net/spi/DefaultProxySelector.java
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),) 
+ifeq ($(PLATFORM), windows) 
     FILES_export += java/net/TwoStacksPlainSocketImpl.java
     FILES_export += java/net/DualStackPlainSocketImpl.java
@@ -78 +82 @@
     FILES_export += java/net/DualStackPlainDatagramSocketImpl.java
 else
+ifeq ($(PLATFORM), os2) 
+    FILES_export += java/net/TwoStacksPlainSocketImpl.java
+    FILES_export += java/net/TwoStacksPlainDatagramSocketImpl.java
+else
     FILES_export += java/net/PlainDatagramSocketImpl.java
+endif
 endif
 
@@ -93 +102 @@
 include $(BUILDDIR)/common/Library.gmk
 
-ifeq ($(filter-out windows os2, $(PLATFORM)),) 
+ifeq ($(PLATFORM), windows) 
   OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
   # Will not compile at warning level 3 if warnings are fatal
   COMPILER_WARNINGS_FATAL=false
 else
+ifeq ($(PLATFORM), os2) 
+  OTHER_LDLIBS = -lws2_32.lib $(JVMLIB)
+else
   OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
+endif
 endif
 ifeq ($(PLATFORM), linux)