Changeset 67

Timestamp:

Jul 16, 2010, 9:25:34 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Pick up correct files when gathering hotspot on OS/2.

Location:

trunk/openjdk/jdk/make

Files:

• common/Release.gmk (modified) (10 diffs)
• java/redist/Makefile (modified) (11 diffs)
• tools/sharing/classlist.os2 (copied) (copied from trunk/openjdk/jdk/make/tools/sharing/classlist.windows )

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

@@ -69 +69 @@
 
 # Text documents on windows use this suffix
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows,os2 $(PLATFORM)),)
   TEXT_SUFFIX = .txt
 endif
@@ -92 +92 @@
     LICENSE_VERSION=.fcs
   endif
-  ifeq ($(PLATFORM), windows)
+  ifeq ($(filter-out windows,os2 $(PLATFORM)),)
     LICENSE_DOCLIST_JDK = $(subst $(LICENSE_VERSION),,\
                    $(shell $(CD) $(SHARE_JDK_DOC_SRC) && \
@@ -398 +398 @@
         sun/tools/jinfo         \
         sun/tools/jmap
-        
+
 # classes that go into jsse.jar
 JSSE_CLASSES_DIRS = \
@@ -516 +516 @@
 endif
 
-# JRE files 
+# JRE files
 $(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
         $(process-doc-file)
@@ -786 +786 @@
                 -o meta-index *.jar
         @$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup)
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows,os2 $(PLATFORM)),)
         @# Remove certain *.lib files
         $(CD) $(JRE_IMAGE_DIR)/lib && \
             $(RM) java.$(LIB_SUFFIX) jvm.$(LIB_SUFFIX) \
                   hpi.$(LIB_SUFFIX) awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX)
-endif # Windows
-ifneq ($(PLATFORM), windows)
+else
         $(call copy-man-pages,$(JRE_IMAGE_DIR),$(JRE_MAN_PAGES))
-endif # !windows
+endif # windows || OS/2
 
 # Trim out any extra files not for the jre shipment but wanted in the jdk jre.
@@ -822 +821 @@
 JRE_ELF_LIST=$(TEMPDIR)/jre-elf-files.list
 $(JRE_ELF_LIST):
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows,os2 $(PLATFORM)),)
         $(RM) $@
         $(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
@@ -907 +906 @@
             fi; \
         done
-  ifeq ($(PLATFORM), windows)
+  ifeq ($(filter-out windows,os2 $(PLATFORM)),)
         @#
         @# lib/
@@ -1045 +1044 @@
         @#
         $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows,os2 $(PLATFORM)),)
         $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
 endif # !windows
@@ -1060 +1059 @@
 JDK_ELF_LIST=$(TEMPDIR)/jdk-elf-files.list
 $(JDK_ELF_LIST):
-ifneq ($(PLATFORM), windows)
+ifneq ($(filter-out windows,os2 $(PLATFORM)),)
         $(RM) $@
         $(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
@@ -1223 +1222 @@
         $(RM) -r $(OUTPUTDIR)/$(ARCH)
 endif
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows,os2 $(PLATFORM)),)
         $(RM) $(TEMPDIR)/rebase.input
 endif

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

@@ -29 +29 @@
 #   that are provided inside this workspace.
 #
-# IMPORT_LIST contains the list of destination files that are copied 
+# IMPORT_LIST contains the list of destination files that are copied
 #     from external places (outside this workspace).
 #
 # INTERNAL_IMPORT_LIST is the list of destination files from BUILDDIR.
-# 
+#
 
 BUILDDIR = ../..
@@ -44 +44 @@
 DB_SUFFIX = _db
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows,os2 $(PLATFORM)),)
   LIB_LOCATION = $(BINDIR)
 else
@@ -54 +54 @@
 JVMMAP_NAME            = $(LIB_PREFIX)jvm.map
 JVMPDB_NAME            = $(LIB_PREFIX)jvm.pdb
+JVMSYM_NAME            = $(LIB_PREFIX)jvm.sym
 LIBJSIG_NAME           = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX)
 JVMDB_NAME             = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
@@ -74 +75 @@
 # On platforms where it is supported, we want to allow it to
 # not be present, at least temporarily.  So,
-# if the SA files (well, just sa-jdi.jar) do not exist 
+# if the SA files (well, just sa-jdi.jar) do not exist
 # in the HOTSPOT_IMPORT_PATH, then we won't build SA.
 SA_EXISTS := $(shell if [ -r $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar ] ; then \
@@ -89 +90 @@
   IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
                  $(LIB_LOCATION)/$(SALIB_NAME)
-  ifeq ($(PLATFORM), windows)
+  ifeq ($(filter-out windows,os2 $(PLATFORM)),)
     IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \
                    $(LIB_LOCATION)/$(SAPDB_NAME)
@@ -134 +135 @@
         $(install-import-file)
 
-# it is OK for the .map and .pdb files to not exist, so do not force a 
+# it is OK for the .map and .pdb files to not exist, so do not force a
 # dependency on them from the bootstrap location, and allow the copy to fail.
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
@@ -148 +149 @@
         -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME)  $@
 
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME): 
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME):
         @$(prep-target)
         -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@
 
 #  Windows     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  Windows
-else # PLATFORM
+else # PLATFORM == windows
+ifeq ($(PLATFORM), os2)
+#  OS/2        vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  OS/2
+
+# Get the hotspot .map and .sym files for client and server
+IMPORT_LIST += \
+        $(LIBDIR)/$(JVMLIB_NAME) \
+        $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
+        $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME)
+
+# Hotspot client is only available on 32-bit builds
+ifeq ($(ARCH_DATA_MODEL), 32)
+  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
+                 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME)
+endif
+
+$(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME)
+        $(install-import-file)
+
+# it is OK for the .map and .sym files to not exist, so do not force a
+# dependency on them from the bootstrap location, and allow the copy to fail.
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
+        @$(prep-target)
+        -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME)  $@
+
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
+        @$(prep-target)
+        -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
+
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME):
+        @$(prep-target)
+        -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMSYM_NAME)  $@
+
+$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME):
+        @$(prep-target)
+        -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMSYM_NAME) $@
+
+#  OS/2        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  OS/2
+
+else
 #  NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  NOT Windows
 
@@ -162 +202 @@
 ifeq ($(PLATFORM), solaris)
   IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
-endif 
+endif
 
 ifneq ($(ZERO_BUILD), true)
@@ -199 +239 @@
 #  NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows
 
-endif # PLATFORM
+endif # PLATFORM == os2
+endif # PLATFORM == windows
 
 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
@@ -246 +287 @@
         $(install-import-file)
 
-ifeq ($(PLATFORM), windows)
+ifeq ($(filter-out windows,os2 $(PLATFORM)),)
 $(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME)
         $(install-import-file)
@@ -306 +347 @@
 FONTSDIR  = $(LIBDIR)/fonts
 FONTSDIRFILE  = $(FONTSDIR)/fonts.dir
-INTERNAL_IMPORT_LIST += $(FONTFILES) 
-
-ifneq ($(PLATFORM), windows)
+INTERNAL_IMPORT_LIST += $(FONTFILES)
+
+ifneq ($(filter-out windows,os2 $(PLATFORM)),)
   INTERNAL_IMPORT_LIST += $(FONTSDIRFILE)
 endif