Mercurial > hg > release > icedtea7-forest-2.2 > hotspot
changeset 3376:f09ae3853e3b
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
Reviewed-by: rbackman, jrose, dholmes
| author | twisti |
|---|---|
| date | Mon, 13 Feb 2012 04:30:59 -0800 |
| parents | 45a1bf98f1bb |
| children | b522995d91f0 |
| files | make/Makefile make/bsd/makefiles/defs.make make/bsd/makefiles/top.make make/defs.make make/linux/makefiles/top.make make/solaris/makefiles/top.make |
| diffstat | 6 files changed, 24 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Mon Feb 13 02:29:22 2012 -0800 +++ b/make/Makefile Mon Feb 13 04:30:59 2012 -0800 @@ -402,7 +402,6 @@ $(install-file) else $(EXPORT_INCLUDE_DIR)/jfr.h: - endif # Doc files (jvmti.html) @@ -448,12 +447,18 @@ ($(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 - endif - $(JDK_IMAGE_DIR)/bin/java -server -version + ifeq ($(ARCH_DATA_MODEL), 64) + $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion + $(JDK_IMAGE_DIR)/bin/java -d64 -server -version + endif copy_product_jdk:: $(RM) -r $(JDK_IMAGE_DIR) @@ -545,6 +550,7 @@ 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 @@ OUTPUTDIR \ BOOTDIR \ JDK_IMPORT_PATH \ + JDK_IMAGE_DIR \ EXPORT_PATH # Make variables that should refer to directories that exist
--- a/make/bsd/makefiles/defs.make Mon Feb 13 02:29:22 2012 -0800 +++ b/make/bsd/makefiles/defs.make Mon Feb 13 04:30:59 2012 -0800 @@ -191,6 +191,9 @@ # 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)
--- a/make/bsd/makefiles/top.make Mon Feb 13 02:29:22 2012 -0800 +++ b/make/bsd/makefiles/top.make Mon Feb 13 04:30:59 2012 -0800 @@ -124,8 +124,8 @@ @$(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]"
--- a/make/defs.make Mon Feb 13 02:29:22 2012 -0800 +++ b/make/defs.make Mon Feb 13 04:30:59 2012 -0800 @@ -193,6 +193,9 @@ # 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.
--- a/make/linux/makefiles/top.make Mon Feb 13 02:29:22 2012 -0800 +++ b/make/linux/makefiles/top.make Mon Feb 13 04:30:59 2012 -0800 @@ -115,8 +115,8 @@ @$(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]"
--- a/make/solaris/makefiles/top.make Mon Feb 13 02:29:22 2012 -0800 +++ b/make/solaris/makefiles/top.make Mon Feb 13 04:30:59 2012 -0800 @@ -107,8 +107,8 @@ 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]"