--- a/common/autoconf/generated-configure.sh Wed Nov 30 19:28:45 2016 +0530
+++ b/common/autoconf/generated-configure.sh Thu Dec 01 11:14:50 2016 +0000
@@ -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=1480584361
###############################################################################
#
@@ -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
--- a/common/autoconf/source-dirs.m4 Wed Nov 30 19:28:45 2016 +0530
+++ b/common/autoconf/source-dirs.m4 Thu Dec 01 11:14:50 2016 +0000
@@ -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
--- a/common/conf/jib-profiles.js Wed Nov 30 19:28:45 2016 +0530
+++ b/common/conf/jib-profiles.js Thu Dec 01 11:14:50 2016 +0000
@@ -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",
--- a/make/GensrcModuleInfo.gmk Wed Nov 30 19:28:45 2016 +0530
+++ b/make/GensrcModuleInfo.gmk Thu Dec 01 11:14:50 2016 +0000
@@ -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
--- a/make/Javadoc.gmk Wed Nov 30 19:28:45 2016 +0530
+++ b/make/Javadoc.gmk Thu Dec 01 11:14:50 2016 +0000
@@ -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 \
--- a/make/common/Modules.gmk Wed Nov 30 19:28:45 2016 +0530
+++ b/make/common/Modules.gmk Thu Dec 01 11:14:50 2016 +0000
@@ -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(/^ +\*.*/, ""); \
--- a/test/lib/sun/hotspot/WhiteBox.java Wed Nov 30 19:28:45 2016 +0530
+++ b/test/lib/sun/hotspot/WhiteBox.java Thu Dec 01 11:14:50 2016 +0000
@@ -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);