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

8157511: JDK-8157348 broke gensrc of module infos with extra provides

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Erik Joelsson 2016-05-23 11:21:50 +02:00
parent f33cf602b8
commit 22ce7a4237
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/GensrcModuleInfo.gmk
View File

@ -102,6 +102,7 @@ ifneq ($(MOD_FILES), )
$(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)))) \
@ -111,6 +112,15 @@ ifneq ($(MOD_FILES), )
$(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), )