Changeset 249 for trunk/openjdk/jdk/make

Timestamp:

Jan 27, 2011, 6:22:28 PM (15 years ago)

Author:

dmik

Message:

jdk: Adopted JPDA to OS/2 and included in the build (closes #19).

Location:

trunk/openjdk/jdk/make

Files:

• Makefile (modified) (1 diff)
• common/Release.gmk (modified) (3 diffs)
• jpda/transport/Makefile (modified) (1 diff)
• jpda/transport/shmem/Makefile (modified) (1 diff)
• jpda/transport/socket/Makefile (modified) (4 diffs)
• mkdemo/Makefile (modified) (1 diff)

trunk/openjdk/jdk/make/Makefile

@@ -260 +260 @@
 all build:: sanity-all post-sanity-all
 
-ifndef OS2_TEMP
 SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
-else # disable JPDA
-SUBDIRS    = tools java javax org sun sunw com mkdemo mksample launchers
-endif
 all build::
         $(SUBDIRS-loop)

trunk/openjdk/jdk/make/common/Release.gmk

@@ -338 +338 @@
 TOOLS = \
 
-ifndef OS2_TEMP # JPDA
 TOOLS += \
         META-INF/services/com.sun.jdi.connect.Connector \
         META-INF/services/com.sun.jdi.connect.spi.TransportService \
-
-endif
-TOOLS += \
         sun/tools/asm           \
         sun/tools/jar           \
@@ -370 +366 @@
         sun/jvmstat             \
         com/sun/javadoc         \
-
-ifndef OS2_TEMP # JPDA
-TOOLS += \
         com/sun/jdi             \
-
-endif
-TOOLS += \
         com/sun/jarsigner       \
         com/sun/mirror          \
         com/sun/source          \
         com/sun/tools/doclets   \
-
-ifndef OS2_TEMP # JPDA
-TOOLS += \
         com/sun/tools/example/debug/expr \
         com/sun/tools/example/debug/tty  \
         com/sun/tools/extcheck  \
-
-endif
-TOOLS += \
         com/sun/tools/hat       \
         com/sun/tools/javac     \
@@ -408 +392 @@
         org/relaxng/datatype   \
         com/sun/xml/internal/dtdparser \
-
-ifndef OS2_TEMP # JPDA
-TOOLS += \
         com/sun/tools/jdi       \
-
-endif
-TOOLS += \
         com/sun/tools/script/shell      \
 

trunk/openjdk/jdk/make/jpda/transport/Makefile

@@ -33 +33 @@
 
 SUBDIRS = socket
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows os2, $(PLATFORM)),)
 SUBDIRS += shmem
 endif # PLATFORM

trunk/openjdk/jdk/make/jpda/transport/shmem/Makefile

@@ -82 +82 @@
 # vpaths for the transport (should not be seen by others)
 #
-vpath %.c $(SHARE_SRC)/native/com/sun/tools/jdi:$(SHARE_SRC)/transport/shmem:$(PLATFORM_SRC)/transport/shmem
+vpath %.c $(SHARE_SRC)/native/com/sun/tools/jdi $(SHARE_SRC)/transport/shmem $(PLATFORM_SRC)/transport/shmem

trunk/openjdk/jdk/make/jpda/transport/socket/Makefile

@@ -30 +30 @@
 BUILDDIR = ../../..
 LIBRARY = dt_socket
+LIBRARY_SHORT = dt_sock
 PRODUCT = jbug
 
@@ -54 +55 @@
 endif
 
+ifeq ($(PLATFORM), os2)
+  OTHER_LDLIBS += -lws2_32.lib
+endif
+
 OTHER_INCLUDES = -I$(INCLUDEDIR) -I$(PLATFORM_INCLUDE) \
                  -I$(SHARE_SRC)/transport/export \
@@ -73 +78 @@
 endif
 
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Library.gmk
-
 # We don't want to link against -ljava
 JAVALIB=
@@ -86 +86 @@
 endif
 
+ifeq ($(PLATFORM), os2)
+
+FILES_c += socket_md_init.c
+vpath %.c $(PLATFORM_SRC_OS2)/transport/socket
+
+# exports live in .def file
+DEF_FILE = $(OBJDIR)/$(LIBRARY).def
+$(DEF_FILE): $(MAKEFILE_LIST)
+        @$(ECHO) "LIBRARY $(LIBRARY) INITINSTANCE TERMINSTANCE" > $@
+        @$(ECHO) 'EXPORTS \n \
+  jdwpTransport_OnLoad = "_jdwpTransport_OnLoad@16" \n \
+' >> $@
+
+clean::
+        -$(RM) $(DEF_FILE)
+
+endif
+
+#
+# Rules.
+#
+include $(BUILDDIR)/common/Library.gmk
+
 #
 # Add to ambient vpath so we pick up the library files
 #
-vpath %.c $(SHARE_SRC)/transport/socket:$(PLATFORM_SRC)/transport/socket
+vpath %.c $(SHARE_SRC)/transport/socket $(PLATFORM_SRC)/transport/socket

trunk/openjdk/jdk/make/mkdemo/Makefile

@@ -32 +32 @@
 include $(BUILDDIR)/common/Defs.gmk
 
-ifndef OS2_TEMP
 SUBDIRS = applets jfc jvmti management jni scripting jpda
-else # disable JPDA
-SUBDIRS = applets jfc jvmti management jni scripting
-endif
 
 all build:: nbproject