6633813: Add standard hotspot import path for Kernel VM
Summary: This problem was discovered testing initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh
--- a/jdk/make/common/shared/Defs-windows.gmk Mon Jun 22 09:16:54 2009 -0400
+++ b/jdk/make/common/shared/Defs-windows.gmk Wed Jun 24 14:49:31 2009 -0400
@@ -631,7 +631,12 @@
ifdef ALT_HOTSPOT_IMPORT_PATH
HOTSPOT_IMPORT_PATH :=$(call FullPath,$(ALT_HOTSPOT_IMPORT_PATH))
else
- HOTSPOT_IMPORT_PATH =$(JDK_IMPORT_PATH)
+ # Default locations include the current $OUTPUTDIR, RE Promotions,
+ # and a JDK. Please be aware the JDK does not include a Kernel VM.
+ _HOTSPOT_IMPORT_PATH1 = $(OUTPUTDIR)/hotspot/import
+ _HOTSPOT_IMPORT_PATH2 = $(PROMOTED_BUILD_DISTDIR)/hotspot/import
+ _HOTSPOT_IMPORT_PATH3 = $(JDK_IMPORT_PATH)
+ HOTSPOT_IMPORT_PATH := $(call DirExists,$(_HOTSPOT_IMPORT_PATH1),$(_HOTSPOT_IMPORT_PATH2),$(_HOTSPOT_IMPORT_PATH3))
endif
HOTSPOT_IMPORT_PATH:=$(call AltCheckSpaces,HOTSPOT_IMPORT_PATH)
HOTSPOT_IMPORT_PATH:=$(call AltCheckValue,HOTSPOT_IMPORT_PATH)
@@ -647,25 +652,6 @@
HOTSPOT_CLIENT_PATH:=$(call AltCheckValue,HOTSPOT_CLIENT_PATH)
endif
-DO_KERNEL=false
-ifneq ($(KERNEL), off)
- # HOTSPOT_KERNEL_PATH: location of kernel jvm library file.
- ifeq ($(ARCH_DATA_MODEL), 32)
- ifdef ALT_HOTSPOT_KERNEL_PATH
- HOTSPOT_KERNEL_PATH := $(call FullPath,$(ALT_HOTSPOT_KERNEL_PATH))
- else
- # if ALT_HOTSPOT_KERNEL_PATH not set, try getting from hotspot build
- HOTSPOT_KERNEL_PATH := $(call FullPath,$(OUTPUTDIR)/bin/kernel)
- endif
- HOTSPOT_KERNEL_PATH:=$(call AltCheckSpaces,HOTSPOT_KERNEL_PATH)
- DO_KERNEL = $(shell if [ -f $(HOTSPOT_KERNEL_PATH)/jvm.dll ] ; then \
- $(ECHO) true ; \
- else \
- $(ECHO) false ; \
- fi )
- endif
-endif
-
# HOTSPOT_SERVER_PATH: location of server jvm library file.
ifdef ALT_HOTSPOT_SERVER_PATH
HOTSPOT_SERVER_PATH :=$(call FullPath,$(ALT_HOTSPOT_SERVER_PATH))
--- a/jdk/make/java/redist/Makefile Mon Jun 22 09:16:54 2009 -0400
+++ b/jdk/make/java/redist/Makefile Wed Jun 24 14:49:31 2009 -0400
@@ -40,7 +40,6 @@
SERVER_LOCATION = server
CLIENT_LOCATION = client
-KERNEL_LOCATION = kernel
DB_SUFFIX = _db
@@ -104,14 +103,6 @@
ifeq ($(PLATFORM), windows)
# Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows
-# Add the Java Kernel VM to the import path, but only on windows 32-bit Windows
-ifeq ($(ARCH_DATA_MODEL), 32)
- ifeq ($(DO_KERNEL), true)
- IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME) \
- $(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt
- endif
-endif
-
IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
# NOTE: These might actually come from BUILDDIR, depends on the settings.