stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8182032: Make java.compiler upgradeable

Browse Source 
Reviewed-by: alanb, erikj
This commit is contained in:
Mandy Chung 2017-06-15 11:54:26 -07:00
parent 8b9968f07b
commit 807e7e9268
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make/CreateJmods.gmk
View File

@ -81,7 +81,6 @@ endif
LEGAL_NOTICES := \ LEGAL_NOTICES := \
$(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
$(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)) \
$(call FindModuleLegalDirs, $(MODULE)) \ $(call FindModuleLegalDirs, $(MODULE)) \
# #
@ -106,10 +105,10 @@ ifeq ($(MODULE), java.base)
DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \
$(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules)))
EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES)))) EXCLUDE_PATTERN := $(strip $(subst $(SPACE),$$|,$(strip $(ALL_UPGRADEABLE_MODULES))))
JMOD_FLAGS += --module-path $(JMODS_DIR) \ JMOD_FLAGS += --module-path $(JMODS_DIR) \
--hash-modules '^(?!$(EXCLUDE_PATTERN))' --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)'
endif endif
endif endif
endif endif

25
make/common/Modules.gmk
View File

@ -72,8 +72,11 @@ BOOT_MODULES += \
jdk.naming.rmi \ jdk.naming.rmi \
# #
# Modules that directly or indirectly requiring upgradeable modules
# should carefully be considered if it should be upgradeable or not.
UPGRADEABLE_MODULES += \ UPGRADEABLE_MODULES += \
java.activation \ java.activation \
java.compiler \
java.corba \ java.corba \
java.transaction \ java.transaction \
java.xml.bind \ java.xml.bind \
@ -82,10 +85,9 @@ UPGRADEABLE_MODULES += \
jdk.internal.vm.compiler \ jdk.internal.vm.compiler \
# #
# Modules explicitly declared as not being upgradeable even though they require UPGRADEABLE_TOOL_MODULES += \
# an upgradeable module. jdk.xml.bind \
NON_UPGRADEABLE_MODULES += \ jdk.xml.ws \
jdk.aot \
# #
AGGREGATOR_MODULES += \ AGGREGATOR_MODULES += \
@ -99,7 +101,6 @@ PLATFORM_MODULES += \
# #
PLATFORM_MODULES += \ PLATFORM_MODULES += \
java.compiler \
java.scripting \ java.scripting \
java.security.jgss \ java.security.jgss \
java.smartcardio \ java.smartcardio \
@ -175,13 +176,10 @@ DOCS_MODULES += \
jdk.policytool \ jdk.policytool \
jdk.rmic \ jdk.rmic \
jdk.scripting.nashorn \ jdk.scripting.nashorn \
jdk.scripting.nashorn.shell \
jdk.sctp \ jdk.sctp \
jdk.security.auth \ jdk.security.auth \
jdk.security.jgss \ jdk.security.jgss \
jdk.xml.bind \
jdk.xml.dom \ jdk.xml.dom \
jdk.xml.ws \
jdk.zipfs \ jdk.zipfs \
# #
@ -384,15 +382,8 @@ FindTransitiveIndirectDepsForModules = \
# Upgradeable modules are those that are either defined as upgradeable or that # Upgradeable modules are those that are either defined as upgradeable or that
# require an upradeable module. # require an upradeable module.
FindAllUpgradeableModules = \ FindAllUpgradeableModules = \
$(filter-out $(MODULES_FILTER) $(NON_UPGRADEABLE_MODULES), \ $(sort $(filter-out $(MODULES_FILTER), $(UPGRADEABLE_MODULES) $(UPGRADEABLE_TOOL_MODULES)))
$(sort $(UPGRADEABLE_MODULES) $(foreach m, \
$(filter-out $(UPGRADEABLE_MODULES), $(call FindAllModules)), \
$(if $(filter $(UPGRADEABLE_MODULES), \
$(call FindTransitiveDepsForModule, $m)), \
$m \
) \
)) \
)
################################################################################ ################################################################################