comparison mx.graal/mx_graal_makefile.py @ 22054:0e095e2c24e2

Rename com.oracle.jvmci to jdk.internal.jvmci
author twisti
date Mon, 22 Jun 2015 12:12:53 -0700
parents 66dd063eb6a0
children 4ce725f06a27
comparison
equal deleted inserted replaced
22053:be8ed2908c59 22054:0e095e2c24e2
199 $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) 199 $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done)
200 200
201 @# Since all projects are built together with one javac call we cannot determine 201 @# Since all projects are built together with one javac call we cannot determine
202 @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it. 202 @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it.
203 $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) 203 $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp)
204 $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/com.oracle.jvmci.hotspot/src_gen/hotspot) 204 $(eval vmconfigDest := $(HS_COMMON_SRC)/../jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot)
205 $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) 205 $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))
206 endef 206 endef
207 207
208 # Reads the files in jvmci.options/ created by OptionProcessor (the processor for the @Option annotation) 208 # Reads the files in jvmci.options/ created by OptionProcessor (the processor for the @Option annotation)
209 # and appends to services/com.oracle.jvmci.options.Options entries for the providers 209 # and appends to services/jdk.internal.jvmci.options.Options entries for the providers
210 # also created by the same processor. 210 # also created by the same processor.
211 # Arguments: 211 # Arguments:
212 # 1: directory with contents of the JAR file 212 # 1: directory with contents of the JAR file
213 define process_options 213 define process_options
214 $(eval options := $(1)/$(OPTIONS_INF)) 214 $(eval options := $(1)/$(OPTIONS_INF))
215 $(eval services := $(1)/META-INF/services) 215 $(eval services := $(1)/META-INF/services)
216 $(QUIETLY) test -d $(services) || mkdir -p $(services) 216 $(QUIETLY) test -d $(services) || mkdir -p $(services)
217 $(QUIETLY) test ! -d $(options) || (cd $(options) && for i in $$(ls); do echo $${i}_Options >> $(abspath $(services))/com.oracle.jvmci.options.Options; done) 217 $(QUIETLY) test ! -d $(options) || (cd $(options) && for i in $$(ls); do echo $${i}_Options >> $(abspath $(services))/jdk.internal.jvmci.options.Options; done)
218 endef 218 endef
219 219
220 # Extracts META-INF/jvmci.services and META-INF/jvmci.options of a JAR file into a given directory 220 # Extracts META-INF/jvmci.services and META-INF/jvmci.options of a JAR file into a given directory
221 # Arguments: 221 # Arguments:
222 # 1: JAR file to extract 222 # 1: JAR file to extract