comparison mx.jvmci/mx_jvmci_makefile.py @ 22618:452ef008f3c3

adapt to mx change in terms of where generated output is placed
author Doug Simon <doug.simon@oracle.com>
date Sun, 27 Sep 2015 15:10:30 +0200
parents 1852abfbaca3
children 1bbd4a7c274b
comparison
equal deleted inserted replaced
22617:e8f298580f99 22618:452ef008f3c3
187 $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) 187 $(QUIETLY) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done)
188 188
189 @# Since all projects are built together with one javac call we cannot determine 189 @# Since all projects are built together with one javac call we cannot determine
190 @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it. 190 @# which project contains HotSpotVMConfig.inline.hpp so we hardcode it.
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)/../mxbuild/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 # Finds the *_OptionsDescriptors classes 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 their names to services/jdk.internal.jvmci.options.OptionDescriptors. 197 # and appends their names to services/jdk.internal.jvmci.options.OptionDescriptors.