Mercurial > hg > openjdk > jdk9
changeset 2325:f04a8e69ec8f
Merge
author | amurillo |
---|---|
date | Thu, 20 Oct 2016 17:05:26 -0700 |
parents | a26dbefcc658 (current diff) 808cae9bfff0 (diff) |
children | 49aa366f9afc |
files | |
diffstat | 12 files changed, 30 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Oct 20 16:53:35 2016 +0300 +++ b/.hgtags Thu Oct 20 17:05:26 2016 -0700 @@ -382,3 +382,5 @@ d7f519b004254b19e384131d9f0d0e40e31a0fd3 jdk-9+137 67c4388142bdf58aec8fefa4475faaa8a5d7380c jdk-9+138 7dcf453eacae79ee86a6bcc75fd0b546fc99b48a jdk-9+139 +a5815c6098a241d3a1df64d22b84b3524e4a77df jdk-9+140 +f64afae7f1a5608e438585bbf0bc23785e69cba0 jdk-9+141
--- a/make/CreateJmods.gmk Thu Oct 20 16:53:35 2016 +0300 +++ b/make/CreateJmods.gmk Thu Oct 20 17:05:26 2016 -0700 @@ -44,6 +44,10 @@ CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF)))) CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE)) +INCLUDE_HEADERS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ + $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS)))) +MAN_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ + $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN)))) $(eval $(call FillCacheFind, \ $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \ @@ -65,6 +69,14 @@ JMOD_FLAGS += --class-path $(CLASSES_DIR) DEPS += $(call CacheFind, $(CLASSES_DIR)) endif +ifneq ($(INCLUDE_HEADERS_DIR), ) + JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR) + DEPS += $(call CacheFind, $(INCLUDE_HEADERS_DIR)) +endif +ifneq ($(MAN_DIR), ) + JMOD_FLAGS += --man-pages $(MAN_DIR) + DEPS += $(call CacheFind, $(MAN_DIR)) +endif # Add dependencies on other jmod files. Only java.base needs access to other # jmods. @@ -103,7 +115,7 @@ --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ --os-version $(REQUIRED_OS_VERSION) \ --module-path $(JMODS_DIR) \ - --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ + --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@
--- a/make/Images.gmk Thu Oct 20 16:53:35 2016 +0300 +++ b/make/Images.gmk Thu Oct 20 17:05:26 2016 -0700 @@ -131,35 +131,41 @@ $(JLINK_JLI_CLASSES) \ # +JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files + ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true) - JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods + JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods endif $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE) $(ECHO) Creating jdk jimage $(RM) -r $(JDK_IMAGE_DIR) - $(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \ - --add-modules $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS) + $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \ + $(JLINK_JDK_EXTRA_OPTS) \ + --output $(JDK_IMAGE_DIR) $(TOUCH) $@ $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE) $(ECHO) Creating jre jimage $(RM) -r $(JRE_IMAGE_DIR) - $(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \ - --add-modules $(JRE_MODULES_LIST) + $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \ + $(JLINK_JRE_EXTRA_OPTS) \ + --output $(JRE_IMAGE_DIR) $(TOUCH) $@ JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3 + $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE) $(ECHO) Creating jre compact1 jimage $(RM) -r $(JRE_COMPACT1_IMAGE_DIR) $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \ + $(JLINK_JRE_EXTRA_OPTS) \ --output $(JRE_COMPACT1_IMAGE_DIR) $(TOUCH) $@ @@ -168,6 +174,7 @@ $(ECHO) Creating jre compact2 jimage $(RM) -r $(JRE_COMPACT2_IMAGE_DIR) $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \ + $(JLINK_JRE_EXTRA_OPTS) \ --output $(JRE_COMPACT2_IMAGE_DIR) $(TOUCH) $@ @@ -176,6 +183,7 @@ $(ECHO) Creating jre compact3 jimage $(RM) -r $(JRE_COMPACT3_IMAGE_DIR) $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \ + $(JLINK_JRE_EXTRA_OPTS) \ --output $(JRE_COMPACT3_IMAGE_DIR) $(TOUCH) $@ @@ -313,16 +321,6 @@ endif # Windows ################################################################################ -# /include dir - -$(eval $(call SetupCopyFiles,COPY_INCLUDES, \ - SRC := $(JDK_OUTPUTDIR)/include, \ - DEST := $(JDK_IMAGE_DIR)/include, \ - FILES := $(call CacheFind,$(JDK_OUTPUTDIR)/include))) - -JDK_TARGETS += $(COPY_INCLUDES) - -################################################################################ # doc files JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
--- a/make/common/SetupJavaCompilers.gmk Thu Oct 20 16:53:35 2016 +0300 +++ b/make/common/SetupJavaCompilers.gmk Thu Oct 20 17:05:26 2016 -0700 @@ -28,11 +28,11 @@ include JavaCompilation.gmk -DISABLE_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally +DISABLE_WARNINGS := -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally # If warnings needs to be non-fatal for testing purposes use a command like: # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" -JAVAC_WARNINGS := -Xlint:all -Werror +JAVAC_WARNINGS := -Xlint:all,-removal -Werror # The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools # and the interim javac, to be run by the boot jdk.
--- a/test/lib/jdk/test/lib/cli/predicate/NotPredicate.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/jdk/test/lib/cli/predicate/NotPredicate.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package jdk.test.lib.cli.predicate;
--- a/test/lib/jdk/test/lib/cli/predicate/OrPredicate.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/jdk/test/lib/cli/predicate/OrPredicate.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package jdk.test.lib.cli.predicate;
--- a/test/lib/sun/hotspot/WhiteBox.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/sun/hotspot/WhiteBox.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package sun.hotspot;
--- a/test/lib/sun/hotspot/code/BlobType.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/sun/hotspot/code/BlobType.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package sun.hotspot.code;
--- a/test/lib/sun/hotspot/code/CodeBlob.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/sun/hotspot/code/CodeBlob.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package sun.hotspot.code;
--- a/test/lib/sun/hotspot/code/NMethod.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/sun/hotspot/code/NMethod.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package sun.hotspot.code;
--- a/test/lib/sun/hotspot/cpuinfo/CPUInfo.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/sun/hotspot/cpuinfo/CPUInfo.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package sun.hotspot.cpuinfo;
--- a/test/lib/sun/hotspot/gc/GC.java Thu Oct 20 16:53:35 2016 +0300 +++ b/test/lib/sun/hotspot/gc/GC.java Thu Oct 20 17:05:26 2016 -0700 @@ -19,7 +19,6 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. - * */ package sun.hotspot.gc;