infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-31 13:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk

Browse Source 
Reviewed-by: rbackman, jrose, dholmes
This commit is contained in:
Christian Thalinger 2012-02-13 04:30:59 -08:00
parent 425b53e062
commit df753a2942
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hotspot/make/Makefile
View File

@ -402,7 +402,6 @@ $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/%
$(install-file)
else
$(EXPORT_INCLUDE_DIR)/jfr.h:
endif
# Doc files (jvmti.html)
@ -448,12 +447,18 @@ $(JDK_IMAGE_DIR)/jre/lib/rt.jar:
($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
test_jdk:
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
$(JDK_IMAGE_DIR)/bin/java -client -version
ifneq ($(ZERO_BUILD), true)
$(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion
$(JDK_IMAGE_DIR)/bin/java -d32 -client -version
endif
$(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion
$(JDK_IMAGE_DIR)/bin/java -d32 -server -version
endif
ifeq ($(ARCH_DATA_MODEL), 64)
$(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion
$(JDK_IMAGE_DIR)/bin/java -d64 -server -version
endif
endif
$(JDK_IMAGE_DIR)/bin/java -server -version
copy_product_jdk::
$(RM) -r $(JDK_IMAGE_DIR)
@ -545,6 +550,7 @@ SLASH_JAVA.desc = Root of all build tools, e.g. /java or J:
OUTPUTDIR.desc = Output directory, default is build/<osname>
BOOTDIR.desc = JDK used to compile agent java source and test with
JDK_IMPORT_PATH.desc = Promoted JDK to copy for 'create_jdk'
JDK_IMAGE_DIR.desc = Directory to place JDK to copy
EXPORT_PATH.desc = Directory to place files to export for JDK build
# Make variables to print out (description and value)
@ -553,6 +559,7 @@ VARIABLE_PRINTVAL_LIST += \
OUTPUTDIR \
BOOTDIR \
JDK_IMPORT_PATH \
JDK_IMAGE_DIR \
EXPORT_PATH
# Make variables that should refer to directories that exist

3
hotspot/make/bsd/makefiles/defs.make
View File

@ -191,6 +191,9 @@ ifeq ($(OS_VENDOR), Darwin)
# Set universal image dir
JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
ifneq ($(ALT_JDK_IMAGE_DIR),)
JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
endif
# Binaries to 'universalize' if built
UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)

4
hotspot/make/bsd/makefiles/top.make
View File

@ -124,8 +124,8 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
@$(UpdatePCH)
@$(MAKE) -f vm.make $(MFLAGS-adjusted)
install: the_vm
@$(MAKE) -f vm.make install
install gamma: the_vm
@$(MAKE) -f vm.make $@
# next rules support "make foo.[ois]"

3
hotspot/make/defs.make
View File

@ -193,6 +193,9 @@ endif
# Default jdk image if one is created for you with create_jdk
JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
ifneq ($(ALT_JDK_IMAGE_DIR),)
JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
endif
# The platform dependent defs.make defines platform specific variable such
# as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.

4
hotspot/make/linux/makefiles/top.make
View File

@ -115,8 +115,8 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
@$(UpdatePCH)
@$(MAKE) -f vm.make $(MFLAGS-adjusted)
install: the_vm
@$(MAKE) -f vm.make install
install gamma: the_vm
@$(MAKE) -f vm.make $@
# next rules support "make foo.[ois]"

4
hotspot/make/solaris/makefiles/top.make
View File

@ -107,8 +107,8 @@ $(adjust-mflags): $(GAMMADIR)/make/$(Platform_os_family)/makefiles/adjust-mflags
the_vm: vm_build_preliminaries $(adjust-mflags)
@$(MAKE) -f vm.make $(MFLAGS-adjusted)
install: the_vm
@$(MAKE) -f vm.make install
install gamma: the_vm
@$(MAKE) -f vm.make $@
# next rules support "make foo.[oi]"