Mercurial > hg > graal-jvmci-8
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 22511:df5a7841f92a | 22512:1852abfbaca3 |
|---|---|
| 191 $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) | 191 $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) |
| 192 $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) | 192 $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) |
| 193 $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) | 193 $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) |
| 194 endef | 194 endef |
| 195 | 195 |
| 196 # Reads the files in jvmci.options/ created by OptionProcessor (the processor for the @Option annotation) | 196 # Finds the *_OptionsDescriptors classes created by OptionProcessor (the processor for the @Option annotation) |
| 197 # and appends to services/jdk.internal.jvmci.options.Options entries for the providers | 197 # and appends their names to services/jdk.internal.jvmci.options.OptionDescriptors. |
| 198 # also created by the same processor. | |
| 199 # Arguments: | 198 # Arguments: |
| 200 # 1: directory with contents of the JAR file | 199 # 1: directory with contents of the JAR file |
| 201 define process_options | 200 define process_options |
| 202 $(eval options := $(1)/$(OPTIONS_INF)) | |
| 203 $(eval services := $(1)/META-INF/services) | 201 $(eval services := $(1)/META-INF/services) |
| 204 $(QUIETLY) test -d $(services) || mkdir -p $(services) | 202 $(QUIETLY) test -d $(services) || mkdir -p $(services) |
| 205 $(QUIETLY) test ! -d $(options) || (cd $(options) && for i in $$(ls); do echo $${i}_OptionDescriptors >> $(abspath $(services))/jdk.internal.jvmci.options.Options; done) | 203 $(eval optionDescriptors := $(1)/META-INF/services/jdk.internal.jvmci.options.OptionDescriptors) |
| 204 $(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 | |
| 206 endef | 205 endef |
| 207 | 206 |
| 208 # Extracts META-INF/jvmci.services from a JAR file into a given directory | 207 # Extracts META-INF/jvmci.services from a JAR file into a given directory |
| 209 # Arguments: | 208 # Arguments: |
| 210 # 1: JAR file to extract | 209 # 1: JAR file to extract |