Mercurial > hg > graal-jvmci-8
comparison make/jvmci.make @ 22672:1bbd4a7c274b
Rename jdk.internal.jvmci to jdk.vm.ci
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Thu, 08 Oct 2015 17:28:41 -0700 |
parents | 452ef008f3c3 |
children | 57646377e480 |
comparison
equal
deleted
inserted
replaced
22671:97f30e4d0e95 | 22672:1bbd4a7c274b |
---|---|
38 $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) | 38 $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) |
39 | 39 |
40 @# Since all projects are built together with one javac call we cannot determine | 40 @# Since all projects are built together with one javac call we cannot determine |
41 @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it. | 41 @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it. |
42 $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) | 42 $(eval vmconfig := $(1)/hotspot/HotSpotVMConfig.inline.hpp) |
43 $(eval vmconfigDest := $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.internal.jvmci.hotspot/src_gen/hotspot) | 43 $(eval vmconfigDest := $(HS_COMMON_SRC)/../mxbuild/jvmci/jdk.vm.ci.hotspot/src_gen/hotspot) |
44 $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) | 44 $(QUIETLY) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) |
45 endef | 45 endef |
46 | 46 |
47 # Finds the *_OptionsDescriptors classes created by OptionProcessor (the processor for the @Option annotation) | 47 # Finds the *_OptionsDescriptors classes created by OptionProcessor (the processor for the @Option annotation) |
48 # and appends their names to services/jdk.internal.jvmci.options.OptionDescriptors. | 48 # and appends their names to services/jdk.vm.ci.options.OptionDescriptors. |
49 # Arguments: | 49 # Arguments: |
50 # 1: directory with contents of the JAR file | 50 # 1: directory with contents of the JAR file |
51 define process_options | 51 define process_options |
52 $(eval services := $(1)/META-INF/services) | 52 $(eval services := $(1)/META-INF/services) |
53 $(QUIETLY) test -d $(services) || mkdir -p $(services) | 53 $(QUIETLY) test -d $(services) || mkdir -p $(services) |
54 $(eval optionDescriptors := $(1)/META-INF/services/jdk.internal.jvmci.options.OptionDescriptors) | 54 $(eval optionDescriptors := $(1)/META-INF/services/jdk.vm.ci.options.OptionDescriptors) |
55 $(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 | 55 $(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 |
56 endef | 56 endef |
57 | 57 |
58 # Extracts META-INF/jvmci.services from a JAR file into a given directory | 58 # Extracts META-INF/jvmci.services from a JAR file into a given directory |
59 # Arguments: | 59 # Arguments: |
117 | 117 |
118 | 118 |
119 | 119 |
120 JDK_BOOTCLASSPATH = $(ABS_BOOTDIR)/jre/lib/resources.jar:$(ABS_BOOTDIR)/jre/lib/rt.jar:$(ABS_BOOTDIR)/jre/lib/sunrsasign.jar:$(ABS_BOOTDIR)/jre/lib/jsse.jar:$(ABS_BOOTDIR)/jre/lib/jce.jar:$(ABS_BOOTDIR)/jre/lib/charsets.jar:$(ABS_BOOTDIR)/jre/lib/jfr.jar:$(ABS_BOOTDIR)/jre/classes | 120 JDK_BOOTCLASSPATH = $(ABS_BOOTDIR)/jre/lib/resources.jar:$(ABS_BOOTDIR)/jre/lib/rt.jar:$(ABS_BOOTDIR)/jre/lib/sunrsasign.jar:$(ABS_BOOTDIR)/jre/lib/jsse.jar:$(ABS_BOOTDIR)/jre/lib/jce.jar:$(ABS_BOOTDIR)/jre/lib/charsets.jar:$(ABS_BOOTDIR)/jre/lib/jfr.jar:$(ABS_BOOTDIR)/jre/classes |
121 | 121 |
122 JVMCI_SERVICE_SRC += $(shell find jvmci/jdk.internal.jvmci.service/src -type f 2> /dev/null) | 122 JVMCI_SERVICE_SRC += $(shell find jvmci/jdk.vm.ci.service/src -type f 2> /dev/null) |
123 | 123 |
124 JVMCI_SERVICE_JAR = $(TARGET)/jvmci-service.jar | 124 JVMCI_SERVICE_JAR = $(TARGET)/jvmci-service.jar |
125 | 125 |
126 EXPORTED_FILES += $(JVMCI_SERVICE_JAR) | 126 EXPORTED_FILES += $(JVMCI_SERVICE_JAR) |
127 | 127 |
128 JVMCI_OPTIONS_SRC += $(shell find jvmci/jdk.internal.jvmci.inittimer/src -type f 2> /dev/null) | 128 JVMCI_OPTIONS_SRC += $(shell find jvmci/jdk.vm.ci.inittimer/src -type f 2> /dev/null) |
129 JVMCI_OPTIONS_SRC += $(shell find jvmci/jdk.internal.jvmci.options/src -type f 2> /dev/null) | 129 JVMCI_OPTIONS_SRC += $(shell find jvmci/jdk.vm.ci.options/src -type f 2> /dev/null) |
130 | 130 |
131 JVMCI_OPTIONS_JAR = $(TARGET)/jvmci-options.jar | 131 JVMCI_OPTIONS_JAR = $(TARGET)/jvmci-options.jar |
132 | 132 |
133 EXPORTED_FILES += $(JVMCI_OPTIONS_JAR) | 133 EXPORTED_FILES += $(JVMCI_OPTIONS_JAR) |
134 | 134 |
135 JVMCI_OPTIONS_PROCESSOR_SRC += $(shell find jvmci/jdk.internal.jvmci.options.processor/src -type f 2> /dev/null) | 135 JVMCI_OPTIONS_PROCESSOR_SRC += $(shell find jvmci/jdk.vm.ci.options.processor/src -type f 2> /dev/null) |
136 | 136 |
137 JVMCI_OPTIONS_PROCESSOR_JAR = $(TARGET)/jvmci-options-processor.jar | 137 JVMCI_OPTIONS_PROCESSOR_JAR = $(TARGET)/jvmci-options-processor.jar |
138 | 138 |
139 JVMCI_OPTIONS_PROCESSOR_DEP_JARS = $(TARGET)/jvmci-options.jar | 139 JVMCI_OPTIONS_PROCESSOR_DEP_JARS = $(TARGET)/jvmci-options.jar |
140 | 140 |
141 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.meta/src -type f 2> /dev/null) | 141 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.meta/src -type f 2> /dev/null) |
142 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.code/src -type f 2> /dev/null) | 142 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.code/src -type f 2> /dev/null) |
143 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.runtime/src -type f 2> /dev/null) | 143 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.runtime/src -type f 2> /dev/null) |
144 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.common/src -type f 2> /dev/null) | 144 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.common/src -type f 2> /dev/null) |
145 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null) | 145 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.compiler/src -type f 2> /dev/null) |
146 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.amd64/src -type f 2> /dev/null) | 146 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.amd64/src -type f 2> /dev/null) |
147 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.sparc/src -type f 2> /dev/null) | 147 JVMCI_API_SRC += $(shell find jvmci/jdk.vm.ci.sparc/src -type f 2> /dev/null) |
148 | 148 |
149 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar | 149 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar |
150 | 150 |
151 JVMCI_API_DEP_JARS = $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-service.jar | 151 JVMCI_API_DEP_JARS = $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-service.jar |
152 | 152 |
153 EXPORTED_FILES += $(JVMCI_API_JAR) | 153 EXPORTED_FILES += $(JVMCI_API_JAR) |
154 | 154 |
155 JVMCI_SERVICE_PROCESSOR_SRC += $(shell find jvmci/jdk.internal.jvmci.service.processor/src -type f 2> /dev/null) | 155 JVMCI_SERVICE_PROCESSOR_SRC += $(shell find jvmci/jdk.vm.ci.service.processor/src -type f 2> /dev/null) |
156 | 156 |
157 JVMCI_SERVICE_PROCESSOR_JAR = $(TARGET)/jvmci-service-processor.jar | 157 JVMCI_SERVICE_PROCESSOR_JAR = $(TARGET)/jvmci-service-processor.jar |
158 | 158 |
159 JVMCI_SERVICE_PROCESSOR_DEP_JARS = $(TARGET)/jvmci-service.jar | 159 JVMCI_SERVICE_PROCESSOR_DEP_JARS = $(TARGET)/jvmci-service.jar |
160 | 160 |
161 JVMCI_HOTSPOTVMCONFIG_SRC += $(shell find jvmci/jdk.internal.jvmci.hotspotvmconfig/src -type f 2> /dev/null) | 161 JVMCI_HOTSPOTVMCONFIG_SRC += $(shell find jvmci/jdk.vm.ci.hotspotvmconfig/src -type f 2> /dev/null) |
162 | 162 |
163 JVMCI_HOTSPOTVMCONFIG_JAR = $(TARGET)/jvmci-hotspotvmconfig.jar | 163 JVMCI_HOTSPOTVMCONFIG_JAR = $(TARGET)/jvmci-hotspotvmconfig.jar |
164 | 164 |
165 EXPORTED_FILES += $(JVMCI_HOTSPOTVMCONFIG_JAR) | 165 EXPORTED_FILES += $(JVMCI_HOTSPOTVMCONFIG_JAR) |
166 | 166 |
167 JVMCI_HOTSPOTVMCONFIG_PROCESSOR_SRC += $(shell find jvmci/jdk.internal.jvmci.hotspotvmconfig.processor/src -type f 2> /dev/null) | 167 JVMCI_HOTSPOTVMCONFIG_PROCESSOR_SRC += $(shell find jvmci/jdk.vm.ci.hotspotvmconfig.processor/src -type f 2> /dev/null) |
168 | 168 |
169 JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR = $(TARGET)/jvmci-hotspotvmconfig-processor.jar | 169 JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR = $(TARGET)/jvmci-hotspotvmconfig-processor.jar |
170 | 170 |
171 JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS = $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-service.jar $(TARGET)/jvmci-api.jar $(TARGET)/jvmci-hotspotvmconfig.jar | 171 JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS = $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-service.jar $(TARGET)/jvmci-api.jar $(TARGET)/jvmci-hotspotvmconfig.jar |
172 | 172 |
173 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.internal.jvmci.hotspot/src -type f 2> /dev/null) | 173 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.vm.ci.hotspot/src -type f 2> /dev/null) |
174 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.internal.jvmci.hotspot.amd64/src -type f 2> /dev/null) | 174 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.vm.ci.hotspot.amd64/src -type f 2> /dev/null) |
175 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.internal.jvmci.hotspot.sparc/src -type f 2> /dev/null) | 175 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.vm.ci.hotspot.sparc/src -type f 2> /dev/null) |
176 ifeq ($(shell find $(ABS_BOOTDIR)/ -name 'jfr.jar'; echo $$?),'0') | 176 ifeq ($(shell find $(ABS_BOOTDIR)/ -name 'jfr.jar'; echo $$?),'0') |
177 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.internal.jvmci.hotspot.jfr/src -type f 2> /dev/null) | 177 JVMCI_HOTSPOT_SRC += $(shell find jvmci/jdk.vm.ci.hotspot.jfr/src -type f 2> /dev/null) |
178 endif | 178 endif |
179 | 179 |
180 JVMCI_HOTSPOT_JAR = $(TARGET)/jvmci-hotspot.jar | 180 JVMCI_HOTSPOT_JAR = $(TARGET)/jvmci-hotspot.jar |
181 | 181 |
182 JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/jvmci-hotspotvmconfig.jar $(TARGET)/jvmci-service.jar $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-api.jar | 182 JVMCI_HOTSPOT_DEP_JARS = $(TARGET)/jvmci-hotspotvmconfig.jar $(TARGET)/jvmci-service.jar $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-api.jar |
192 $(JVMCI_OPTIONS_JAR): $(JVMCI_OPTIONS_SRC) | 192 $(JVMCI_OPTIONS_JAR): $(JVMCI_OPTIONS_SRC) |
193 $(call build_and_jar,,$(subst $(space),:,),,$(JVMCI_OPTIONS_JAR)) | 193 $(call build_and_jar,,$(subst $(space),:,),,$(JVMCI_OPTIONS_JAR)) |
194 | 194 |
195 | 195 |
196 $(JVMCI_OPTIONS_PROCESSOR_JAR): $(JVMCI_OPTIONS_PROCESSOR_SRC) $(JVMCI_OPTIONS_PROCESSOR_DEP_JARS) | 196 $(JVMCI_OPTIONS_PROCESSOR_JAR): $(JVMCI_OPTIONS_PROCESSOR_SRC) $(JVMCI_OPTIONS_PROCESSOR_DEP_JARS) |
197 $(call build_and_jar,,$(subst $(space),:,$(JVMCI_OPTIONS_PROCESSOR_DEP_JARS)),jvmci/jdk.internal.jvmci.options.processor/src/META-INF,$(JVMCI_OPTIONS_PROCESSOR_JAR)) | 197 $(call build_and_jar,,$(subst $(space),:,$(JVMCI_OPTIONS_PROCESSOR_DEP_JARS)),jvmci/jdk.vm.ci.options.processor/src/META-INF,$(JVMCI_OPTIONS_PROCESSOR_JAR)) |
198 | 198 |
199 | 199 |
200 $(JVMCI_API_JAR): $(JVMCI_API_SRC) $(JVMCI_OPTIONS_PROCESSOR_JAR) $(JVMCI_API_DEP_JARS) | 200 $(JVMCI_API_JAR): $(JVMCI_API_SRC) $(JVMCI_OPTIONS_PROCESSOR_JAR) $(JVMCI_API_DEP_JARS) |
201 $(call build_and_jar,$(JVMCI_OPTIONS_PROCESSOR_JAR):$(subst $(space),:,$(JVMCI_OPTIONS_PROCESSOR_DEP_JARS)),$(subst $(space),:,$(JVMCI_API_DEP_JARS)),,$(JVMCI_API_JAR)) | 201 $(call build_and_jar,$(JVMCI_OPTIONS_PROCESSOR_JAR):$(subst $(space),:,$(JVMCI_OPTIONS_PROCESSOR_DEP_JARS)),$(subst $(space),:,$(JVMCI_API_DEP_JARS)),,$(JVMCI_API_JAR)) |
202 | 202 |
203 | 203 |
204 $(JVMCI_SERVICE_PROCESSOR_JAR): $(JVMCI_SERVICE_PROCESSOR_SRC) $(JVMCI_SERVICE_PROCESSOR_DEP_JARS) | 204 $(JVMCI_SERVICE_PROCESSOR_JAR): $(JVMCI_SERVICE_PROCESSOR_SRC) $(JVMCI_SERVICE_PROCESSOR_DEP_JARS) |
205 $(call build_and_jar,,$(subst $(space),:,$(JVMCI_SERVICE_PROCESSOR_DEP_JARS)),jvmci/jdk.internal.jvmci.service.processor/src/META-INF,$(JVMCI_SERVICE_PROCESSOR_JAR)) | 205 $(call build_and_jar,,$(subst $(space),:,$(JVMCI_SERVICE_PROCESSOR_DEP_JARS)),jvmci/jdk.vm.ci.service.processor/src/META-INF,$(JVMCI_SERVICE_PROCESSOR_JAR)) |
206 | 206 |
207 | 207 |
208 $(JVMCI_HOTSPOTVMCONFIG_JAR): $(JVMCI_HOTSPOTVMCONFIG_SRC) | 208 $(JVMCI_HOTSPOTVMCONFIG_JAR): $(JVMCI_HOTSPOTVMCONFIG_SRC) |
209 $(call build_and_jar,,$(subst $(space),:,),,$(JVMCI_HOTSPOTVMCONFIG_JAR)) | 209 $(call build_and_jar,,$(subst $(space),:,),,$(JVMCI_HOTSPOTVMCONFIG_JAR)) |
210 | 210 |
211 | 211 |
212 $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR): $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_SRC) $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS) | 212 $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR): $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_SRC) $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS) |
213 $(call build_and_jar,,$(subst $(space),:,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS)),jvmci/jdk.internal.jvmci.hotspotvmconfig.processor/src/META-INF,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR)) | 213 $(call build_and_jar,,$(subst $(space),:,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS)),jvmci/jdk.vm.ci.hotspotvmconfig.processor/src/META-INF,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR)) |
214 | 214 |
215 | 215 |
216 $(JVMCI_HOTSPOT_JAR): $(JVMCI_HOTSPOT_SRC) $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR) $(JVMCI_OPTIONS_PROCESSOR_JAR) $(JVMCI_SERVICE_PROCESSOR_JAR) $(JVMCI_HOTSPOT_DEP_JARS) | 216 $(JVMCI_HOTSPOT_JAR): $(JVMCI_HOTSPOT_SRC) $(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR) $(JVMCI_OPTIONS_PROCESSOR_JAR) $(JVMCI_SERVICE_PROCESSOR_JAR) $(JVMCI_HOTSPOT_DEP_JARS) |
217 $(call build_and_jar,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR):$(JVMCI_OPTIONS_PROCESSOR_JAR):$(JVMCI_SERVICE_PROCESSOR_JAR):$(subst $(space),:,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS)):$(subst $(space),:,$(JVMCI_OPTIONS_PROCESSOR_DEP_JARS)):$(subst $(space),:,$(JVMCI_SERVICE_PROCESSOR_DEP_JARS)),$(subst $(space),:,$(JVMCI_HOTSPOT_DEP_JARS)),,$(JVMCI_HOTSPOT_JAR)) | 217 $(call build_and_jar,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_JAR):$(JVMCI_OPTIONS_PROCESSOR_JAR):$(JVMCI_SERVICE_PROCESSOR_JAR):$(subst $(space),:,$(JVMCI_HOTSPOTVMCONFIG_PROCESSOR_DEP_JARS)):$(subst $(space),:,$(JVMCI_OPTIONS_PROCESSOR_DEP_JARS)):$(subst $(space),:,$(JVMCI_SERVICE_PROCESSOR_DEP_JARS)),$(subst $(space),:,$(JVMCI_HOTSPOT_DEP_JARS)),,$(JVMCI_HOTSPOT_JAR)) |
218 | 218 |