# HG changeset patch # User prr # Date 1480617319 28800 # Node ID c741ed52f9a68b8eefa055ef5b456303a01fc228 # Parent 0aeacf92b0f8a169c02fc6821ea6ce9ba72fe53f# Parent d8c997ec29fe6e4163751749d70346f2da15bc25 Merge diff -r 0aeacf92b0f8 -r c741ed52f9a6 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Tue Nov 29 15:20:30 2016 -0800 +++ b/common/autoconf/generated-configure.sh Thu Dec 01 10:35:19 2016 -0800 @@ -5093,7 +5093,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1479997904 +DATE_WHEN_GENERATED=1480601517 ############################################################################### # @@ -31198,6 +31198,12 @@ if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" fi + # Workaround for using different imported module-info.java in Jake due to a + # change in format. Remove once new format is standard in JDK 9 and javafx + # delivers just that. + if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then + IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC" + fi if test -d "$IMPORT_MODULES_TOPDIR/make"; then IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make" fi @@ -33578,9 +33584,11 @@ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then # cc -V output typically looks like # cc: Sun C 5.12 Linux_i386 2011/11/16 + # or + # cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31 COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1` # Check that this is likely to be the Solaris Studio cc. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null if test $? -ne 0; then ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5 @@ -34875,9 +34883,11 @@ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then # cc -V output typically looks like # cc: Sun C 5.12 Linux_i386 2011/11/16 + # or + # cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31 COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1` # Check that this is likely to be the Solaris Studio cc. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null if test $? -ne 0; then ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5 @@ -46956,9 +46966,11 @@ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then # cc -V output typically looks like # cc: Sun C 5.12 Linux_i386 2011/11/16 + # or + # cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31 COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1` # Check that this is likely to be the Solaris Studio cc. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null if test $? -ne 0; then ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5 @@ -47076,9 +47088,11 @@ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then # cc -V output typically looks like # cc: Sun C 5.12 Linux_i386 2011/11/16 + # or + # cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31 COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1` # Check that this is likely to be the Solaris Studio cc. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null if test $? -ne 0; then ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5 diff -r 0aeacf92b0f8 -r c741ed52f9a6 common/autoconf/source-dirs.m4 --- a/common/autoconf/source-dirs.m4 Tue Nov 29 15:20:30 2016 -0800 +++ b/common/autoconf/source-dirs.m4 Thu Dec 01 10:35:19 2016 -0800 @@ -126,6 +126,12 @@ if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" fi + # Workaround for using different imported module-info.java in Jake due to a + # change in format. Remove once new format is standard in JDK 9 and javafx + # delivers just that. + if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then + IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC" + fi if test -d "$IMPORT_MODULES_TOPDIR/make"; then IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make" fi diff -r 0aeacf92b0f8 -r c741ed52f9a6 common/autoconf/toolchain.m4 --- a/common/autoconf/toolchain.m4 Tue Nov 29 15:20:30 2016 -0800 +++ b/common/autoconf/toolchain.m4 Thu Dec 01 10:35:19 2016 -0800 @@ -333,9 +333,11 @@ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then # cc -V output typically looks like # cc: Sun C 5.12 Linux_i386 2011/11/16 + # or + # cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31 COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1` # Check that this is likely to be the Solaris Studio cc. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null if test $? -ne 0; then ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) diff -r 0aeacf92b0f8 -r c741ed52f9a6 common/bin/compare.sh --- a/common/bin/compare.sh Tue Nov 29 15:20:30 2016 -0800 +++ b/common/bin/compare.sh Thu Dec 01 10:35:19 2016 -0800 @@ -1295,8 +1295,8 @@ OTHER_JDK="$OTHER/images/jdk" OTHER_JRE="$OTHER/images/jre" echo "Selecting jdk images for compare" - elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk)" ] \ - && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk)" ] + elif [ -d "$(ls -d $THIS/licensee-src/build/*/images/jdk 2> /dev/null)" ] \ + && [ -d "$(ls -d $OTHER/licensee-src/build/*/images/jdk 2> /dev/null)" ] then echo "Selecting licensee images for compare" # Simply override the THIS and OTHER dir with the build dir from diff -r 0aeacf92b0f8 -r c741ed52f9a6 common/conf/jib-profiles.js --- a/common/conf/jib-profiles.js Tue Nov 29 15:20:30 2016 -0800 +++ b/common/conf/jib-profiles.js Thu Dec 01 10:35:19 2016 -0800 @@ -427,7 +427,7 @@ jtreg: { server: "javare", revision: "4.2", - build_number: "b03", + build_number: "b04", checksum_file: "MD5_VALUES", file: "jtreg_bin-4.2.zip", environment_name: "JT_HOME", diff -r 0aeacf92b0f8 -r c741ed52f9a6 make/GensrcModuleInfo.gmk --- a/make/GensrcModuleInfo.gmk Tue Nov 29 15:20:30 2016 -0800 +++ b/make/GensrcModuleInfo.gmk Thu Dec 01 10:35:19 2016 -0800 @@ -60,8 +60,8 @@ ################################################################################ -# Name of data file. Keep module-info.java.ext until javafx has changed. -MOD_FILENAME := module-info.java.extra module-info.java.ext +# Name of modification file. +MOD_FILENAME := module-info.java.extra # Construct all possible src directories for the module. MODULE_CLASSES_DIRS := $(call FindModuleSrcDirs, $(MODULE)) @@ -74,74 +74,24 @@ # Only make this call if modification files are found for this module ALL_MODULES := $(call FindAllModules) - # Read the contents of all the files into a variable. Replace space with / to - # let space represent new lines in the variable as $(shell) normalizes all - # whitespace. - $(foreach f, $(MOD_FILES), \ - $(eval MOD_FILE_CONTENTS += $(shell $(GREP) -v -e ".\*" -e "//" $f | $(TR) ' ' '/'))) - - # Separate the modifications into qualified exports and the rest - MODS_QUALIFIED_EXPORTS := $(call containing, /to/, $(MOD_FILE_CONTENTS)) - MODS_REST := $(filter-out $(MODS_QUALIFIED_EXPORTS), $(MOD_FILE_CONTENTS)) - - # Filter the contents for modules that are actually being built - ALL_MODULES_FILTER := $(addprefix %/, $(addsuffix ;, $(ALL_MODULES))) - MODIFICATIONS := $(filter $(ALL_MODULES_FILTER), $(MODS_QUALIFIED_EXPORTS)) \ - $(MODS_REST) - - # Returns non empty if the package exists in the current module - # Param 1 - Name of package with dots - PackageExists = \ - $(strip $(wildcard $(addsuffix $(subst .,/,/$(strip $1)), \ - $(MODULE_CLASSES_DIRS) \ - $(addsuffix /$(MODULE), $(IMPORT_MODULES_CLASSES)) \ - $(JDK_OUTPUTDIR)/modules/$(MODULE) \ - ))) - - # Convert the modification lines into arguments for the modification tool. - # Filter out modifications for non existing to-modules. - $(foreach line, $(MODIFICATIONS), \ - $(eval split_line := $(subst /,$(SPACE),$(line))) \ - $(eval command := $(word 1, $(split_line))) \ - $(if $(filter $(command), exports), \ - $(eval package := $(patsubst %;,%,$(word 2, $(split_line)))) \ - $(if $(call PackageExists, $(package)), \ - $(eval to_module := $(patsubst %;,%,$(word 4, $(split_line)))) \ - $(if $(to_module), \ - $(eval ARGS += -$(command) $(package)/$(to_module)) \ - , \ - $(eval ARGS += -$(command) $(package)) \ - ) \ - ) \ - , \ - $(if $(filter $(command), provides), \ - $(eval provider := $(patsubst %;,%,$(word 2, $(split_line)))) \ - $(eval class := $(patsubst %;,%,$(word 4, $(split_line)))) \ - $(eval ARGS += -$(command) $(provider)/$(class)) \ - , \ - $(error A module-info.extra in $(MODULE) contains invalid command $(command)) \ - ) \ - ) \ - ) - - ifneq ($(ARGS), ) - $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java: \ - $(firstword $(call FindAllModuleInfos, $(MODULE))) \ - $(BUILD_TOOLS_JDK) \ - $(call DependOnVariable, ARGS) + $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java: \ + $(firstword $(call FindAllModuleInfos, $(MODULE))) \ + $(BUILD_TOOLS_JDK) \ + $(MOD_FILES) \ + $(call DependOnVariable, ALL_MODULES) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp - $(TOOL_GENMODULEINFOSOURCE) $(ARGS) -o $@.tmp $< + $(TOOL_GENMODULEINFOSOURCE) -o $@.tmp \ + --source-file $< \ + --modules $(call CommaList, $(ALL_MODULES)) \ + $(MOD_FILES) $(MV) $@.tmp $@ - TARGETS += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java - endif + TARGETS += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java -endif - -# If no modifications are found for this module, remove any module-info.java -# created by a previous build since that is no longer valid. -ifeq ($(MODIFICATIONS), ) +else + # If no modifications are found for this module, remove any module-info.java + # created by a previous build since that is no longer valid. ifneq ($(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java), ) $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java) endif diff -r 0aeacf92b0f8 -r c741ed52f9a6 make/Images.gmk --- a/make/Images.gmk Tue Nov 29 15:20:30 2016 -0800 +++ b/make/Images.gmk Thu Dec 01 10:35:19 2016 -0800 @@ -48,7 +48,8 @@ JDK_MODULES += $(ALL_MODULES) # Compact builds have additional modules -COMPACT1_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec +COMPACT1_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec \ + jdk.unsupported COMPACT2_EXTRA_MODULES := jdk.xml.dom jdk.httpserver COMPACT3_EXTRA_MODULES := java.smartcardio jdk.management \ jdk.naming.dns jdk.naming.rmi jdk.sctp jdk.security.auth @@ -64,48 +65,9 @@ JRE_COMPACT3_MODULES_LIST := $(call CommaList, $(JRE_COMPACT3_MODULES)) ################################################################################ -# Release file BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release -# Common way to emit a line into the release or info file -define info-file-item # name value - $(PRINTF) '%s="%s"\n' $1 $2 >> $@ -endef - -# Param 1 - The file containing the MODULES list -define create-info-file - $(if $(JDK_ARCH_ABI_PROP_NAME), \ - $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) - $(call info-file-item, "SOURCE", "$(strip $(SOURCE_REVISION))") -endef - -# Param 1 - The file containing the MODULES list -define prepare-info-file - $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) - $(MKDIR) -p $(@D) - $(RM) $@ -endef - -define info-file - $(call prepare-info-file) - $(call create-info-file) -endef - -# Create a variable dependency file common for all release info files. -INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file) - -SOURCE_REVISION = $(shell \ - if [ -f $(SOURCE_REVISION_TRACKER) ] ; then \ - $(CAT) $(SOURCE_REVISION_TRACKER) ; \ - fi) - -# The SOURCE_REVISION_TRACKER file may not exist. Only depend on it if it does. -$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(wildcard $(SOURCE_REVISION_TRACKER)) - $(info-file) - -################################################################################ - JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod) # Use this file inside the image as target for make rule @@ -125,7 +87,8 @@ /jdk.localedata/** \ # -JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \ +JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \ + --module-path $(IMAGES_OUTPUTDIR)/jmods \ --endian $(OPENJDK_BUILD_CPU_ENDIAN) \ --release-info $(BASE_RELEASE_FILE) \ --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ diff -r 0aeacf92b0f8 -r c741ed52f9a6 make/Javadoc.gmk --- a/make/Javadoc.gmk Tue Nov 29 15:20:30 2016 -0800 +++ b/make/Javadoc.gmk Thu Dec 01 10:35:19 2016 -0800 @@ -33,7 +33,7 @@ # Allow custom to overwrite. JAVADOC_SOURCE_DIRS = \ $(SUPPORT_OUTPUTDIR)/gensrc/* \ - $(if $(IMPORT_MODULES_SRC), $(IMPORT_MODULES_SRC)/*) \ + $(addsuffix /*, $(IMPORT_MODULES_SRC)) \ $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS)/classes \ $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_TYPE)/classes \ $(JDK_TOPDIR)/src/*/share/classes \ diff -r 0aeacf92b0f8 -r c741ed52f9a6 make/Main.gmk --- a/make/Main.gmk Tue Nov 29 15:20:30 2016 -0800 +++ b/make/Main.gmk Thu Dec 01 10:35:19 2016 -0800 @@ -324,13 +324,16 @@ mac-bundles-jdk: +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk) +release-file: + +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk) + exploded-image-optimize: +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk) ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \ zip-source jrtfs-jar jdk-image jre-image \ symbols-image profiles mac-bundles-jdk \ - exploded-image-optimize + release-file exploded-image-optimize ################################################################################ # Docs targets @@ -679,10 +682,12 @@ java.base-jmod jdk-image jre-image: generate-link-opt-data endif - jdk-image: jmods zip-source create-source-revision-tracker demos samples - jre-image: jmods create-source-revision-tracker + release-file: create-source-revision-tracker - profiles: jmods zip-source create-source-revision-tracker + jdk-image: jmods zip-source demos samples release-file + jre-image: jmods release-file + + profiles: jmods release-file mac-bundles-jdk: jdk-image jre-image @@ -789,7 +794,7 @@ # The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk. exploded-image-base: $(ALL_MODULES) -exploded-image: exploded-image-base +exploded-image: exploded-image-base release-file # When cross compiling, no need to optimize the exploded image since it won't # be runnable on the host platform anyway. ifneq ($(COMPILE_TYPE), cross) diff -r 0aeacf92b0f8 -r c741ed52f9a6 make/ReleaseFile.gmk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/ReleaseFile.gmk Thu Dec 01 10:35:19 2016 -0800 @@ -0,0 +1,86 @@ +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# 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. +# + +default: all + +include $(SPEC) +include MakeBase.gmk + +################################################################################ +# This makefile generates the "release" file into the exploded image. Jlink is +# then responsible for using this as the base for release files in each linked +# image. +# +################################################################################ + +BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release + +# Common way to emit a line into the release or info file +define info-file-item # name value + $(PRINTF) '%s="%s"\n' $1 $2 >> $@ +endef + +# Param 1 - The file containing the MODULES list +define create-info-file + $(if $(JDK_ARCH_ABI_PROP_NAME), \ + $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) + $(call info-file-item, "SOURCE", "$(strip $(SOURCE_REVISION))") +endef + +# Param 1 - The file containing the MODULES list +define prepare-info-file + $(call LogInfo, Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)) + $(call MakeDir, $(@D)) + $(RM) $@ +endef + +define info-file + $(call prepare-info-file) + $(call create-info-file) +endef + +# Create a variable dependency file common for all release info files. +INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file) + +SOURCE_REVISION = $(shell \ + if [ -f $(SOURCE_REVISION_TRACKER) ] ; then \ + $(CAT) $(SOURCE_REVISION_TRACKER) ; \ + fi) + +# The SOURCE_REVISION_TRACKER file may not exist. Only depend on it if it does. +$(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(wildcard $(SOURCE_REVISION_TRACKER)) + $(info-file) + +TARGETS += $(BASE_RELEASE_FILE) + +################################################################################ + +$(eval $(call IncludeCustomExtension, , ReleaseFile.gmk)) + +################################################################################ + +all: $(TARGETS) + +.PHONY: all default diff -r 0aeacf92b0f8 -r c741ed52f9a6 make/common/Modules.gmk --- a/make/common/Modules.gmk Tue Nov 29 15:20:30 2016 -0800 +++ b/make/common/Modules.gmk Thu Dec 01 10:35:19 2016 -0800 @@ -171,12 +171,15 @@ # Find all module-info.java files for the current build target platform and # configuration. +# TODO: The $(firstword call is part of a workaround for using different +# imported module-info.java in Jake due to a change in format. Remove once +# new format is standard in JDK 9 and javafx delivers just that. # Param 1 - Module to find for, set to * for finding all FindAllModuleInfos = \ $(wildcard \ $(foreach sub, $(SRC_SUBDIRS), \ $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \ - $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC))) + $(patsubst %,%/$(strip $1)/module-info.java, $(firstword $(IMPORT_MODULES_SRC)))) # Find module-info.java files in the specific source dir # Param 1 - Src dir to find module-info.java files in @@ -244,7 +247,7 @@ BEGIN { if (MODULE != "java.base") printf(" java.base"); } \ /requires/ { sub(/;/, ""); \ sub(/requires/, ""); \ - sub(/public/, ""); \ + sub(/transitive/, ""); \ sub(/\/\/.*/, ""); \ sub(/\/\*.*\*\//, ""); \ gsub(/^ +\*.*/, ""); \ diff -r 0aeacf92b0f8 -r c741ed52f9a6 test/lib/sun/hotspot/WhiteBox.java --- a/test/lib/sun/hotspot/WhiteBox.java Tue Nov 29 15:20:30 2016 -0800 +++ b/test/lib/sun/hotspot/WhiteBox.java Thu Dec 01 10:35:19 2016 -0800 @@ -453,8 +453,6 @@ Object[] packages); public native void AddModuleExports(Object from_module, String pkg, Object to_module); public native void AddReadsModule(Object from_module, Object source_module); - public native boolean CanReadModule(Object asking_module, Object source_module); - public native boolean IsExportedToModule(Object from_module, String pkg, Object to_module); public native void AddModulePackage(Object module, String pkg); public native void AddModuleExportsToAllUnnamed(Object module, String pkg); public native void AddModuleExportsToAll(Object module, String pkg);