Mercurial > hg > graal-jvmci-8
diff mx.jvmci/mx_jvmci_makefile.py @ 22512:1852abfbaca3
removed use of intermediate jvmci.options/ directory to create OptionDescriptors service files
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 03 Sep 2015 17:03:51 +0200 |
parents | 9c55f608b79e |
children | 452ef008f3c3 |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci_makefile.py Thu Sep 03 14:47:36 2015 +0200 +++ b/mx.jvmci/mx_jvmci_makefile.py Thu Sep 03 17:03:51 2015 +0200 @@ -193,16 +193,15 @@ $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) endef -# Reads the files in jvmci.options/ created by OptionProcessor (the processor for the @Option annotation) -# and appends to services/jdk.internal.jvmci.options.Options entries for the providers -# also created by the same processor. +# Finds the *_OptionsDescriptors classes created by OptionProcessor (the processor for the @Option annotation) +# and appends their names to services/jdk.internal.jvmci.options.OptionDescriptors. # Arguments: # 1: directory with contents of the JAR file define process_options - $(eval options := $(1)/$(OPTIONS_INF)) $(eval services := $(1)/META-INF/services) $(QUIETLY) test -d $(services) || mkdir -p $(services) - $(QUIETLY) test ! -d $(options) || (cd $(options) && for i in $$(ls); do echo $${i}_OptionDescriptors >> $(abspath $(services))/jdk.internal.jvmci.options.Options; done) + $(eval optionDescriptors := $(1)/META-INF/services/jdk.internal.jvmci.options.OptionDescriptors) + $(QUIETLY) cd $(1) && for i in $$(find . -name '*_OptionDescriptors.class' 2>/dev/null); do echo $${i} | sed 's:\\./\\(.*\\)\\.class:\\1:g' | tr '/' '.' >> $(abspath $(optionDescriptors)); done endef # Extracts META-INF/jvmci.services from a JAR file into a given directory