Changeset 67 for trunk/openjdk/jdk/make/common

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.

File:

• trunk/openjdk/jdk/make/common/Release.gmk (modified) (10 diffs)

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