Changeset 337 for trunk/openjdk

Timestamp:

Feb 28, 2012, 6:52:17 PM (13 years ago)

Author:

dmik

Message:

Fully obey BUILD_CLIENT_ONLY on OS/2.

This completely disables building the server JVM and requiring
its parts by other components. Useful for developing.

Location:

trunk/openjdk

Files:

• hotspot/make/os2/makefiles/defs.make (modified) (4 diffs)
• jdk/make/java/redist/Makefile (modified) (2 diffs)

trunk/openjdk/hotspot/make/os2/makefiles/defs.make

@@ -86 +86 @@
 endif
 
+ifndef BUILD_CLIENT_ONLY
 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
@@ -91 +92 @@
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.sym
+endif
+
 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
+
 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
@@ -97 +101 @@
 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.sym
+
+ifndef BUILD_CLIENT_ONLY
 # kernel vm
 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
@@ -103 +109 @@
 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.sym
+endif
 
 ifeq ($(BUILD_OS2_SA), 1)

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

@@ -69 +69 @@
 
 # List of files coming from outside this workspace
+ifndef BUILD_CLIENT_ONLY
 IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \
               $(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt
+endif
 
 # INCLUDE_SA is false on platforms where SA is not supported.
@@ -160 +162 @@
 # Get the hotspot .map and .sym files for client and server
 IMPORT_LIST += \
-        $(LIBDIR)/$(JVMLIB_NAME) \
+        $(LIBDIR)/$(JVMLIB_NAME)
+
+ifndef BUILD_CLIENT_ONLY
+IMPORT_LIST += \
         $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
         $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME)
+endif
 
 # Hotspot client is only available on 32-bit builds