Changeset 144 for trunk/openjdk/jdk/make/common/Release.gmk

Timestamp:

Sep 4, 2010, 1:44:54 AM (15 years ago)

Author:

dmik

Message:

jdk/make: Added ifndef OS2_TEMP to disable various components we don't yet support and thus make it possible to have a full build cycle.

File:

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

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

@@ -337 +337 @@
 #
 TOOLS = \
+
+ifndef OS2_TEMP # security
+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           \
@@ -351 +357 @@
         sun/tools/tree          \
         sun/tools/util          \
+
+ifndef OS2_TEMP # security
+TOOLS += \
         sun/security/tools/JarBASE64Encoder.class \
         sun/security/tools/JarSigner.class \
@@ -360 +369 @@
         sun/security/tools/SignatureFile.class \
         sun/security/tools/TimestampedSigner.class \
+
+endif
+TOOLS += \
         sun/rmi/rmic            \
         sun/applet              \
         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     \
@@ -390 +414 @@
         org/relaxng/datatype   \
         com/sun/xml/internal/dtdparser \
+
+ifndef OS2_TEMP # JPDA
+TOOLS += \
         com/sun/tools/jdi       \
+
+endif
+TOOLS += \
         com/sun/tools/script/shell      \
+
+ifndef OS2_TEMP # com.sun.tools.attach
+TOOLS += \
         META-INF/services/com.sun.tools.attach.spi.AttachProvider \
         com/sun/tools/attach    \
         sun/tools/attach        \
+
+endif
+TOOLS += \
         sun/tools/jstack        \
         sun/tools/jinfo         \
@@ -660 +696 @@
         @$(java-vm-cleanup)
 
+ifndef OS2_TEMP # security
 # Create jsse.jar containing SunJSSE implementation classes
 JSSE_JAR=$(TEMPDIR)/jsse-orig.jar
@@ -668 +705 @@
                 $(JAR_JFLAGS)
         @$(java-vm-cleanup)
+endif
 
 # Create sec-bin.zip
@@ -776 +814 @@
         $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
         $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
+ifndef OS2_TEMP # security      
         $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+endif
         @# Generate meta-index to make boot and extension class loaders lazier
         $(CD) $(JRE_IMAGE_DIR)/lib && \
@@ -911 +951 @@
         @#
         $(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
+ifndef OS2_TEMP
         $(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
+endif
         @#
         @# bin/
@@ -980 +1022 @@
         @# So for Linux, make use of the -T option (like Solaris' -I option) of
         @# obtaining the list of files from a file. MKS tar has no such option.
-  ifeq ($(PLATFORM), linux)
+  ifeq ($(filter-out linux os2, $(PLATFORM)),)
         for d in $(SOURCE_DIRS); do \
           $(RM) $(ABS_TEMPDIR)/src-files.list; \
@@ -1037 +1079 @@
         @# demo, include
         @#
+ifndef OS2_TEMP
         $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
         $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
@@ -1044 +1087 @@
         @#
         $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
+endif
 ifneq ($(filter-out windows os2, $(PLATFORM)),)
         $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))