Mercurial > hg > openjdk > jdk9 > hotspot
changeset 12765:c2314cb67e28
8180453: [JVMCI] mx eclipseinit doesn't pick up generated sources
Reviewed-by: kvn
| author | twisti |
|---|---|
| date | Thu, 18 May 2017 16:39:19 -0700 |
| parents | 6427ba02ae4b |
| children | 34c47915ae05 |
| files | .mx.jvmci/mx_jvmci.py |
| diffstat | 1 files changed, 4 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.mx.jvmci/mx_jvmci.py Thu May 18 16:48:24 2017 +0000 +++ b/.mx.jvmci/mx_jvmci.py Thu May 18 16:39:19 2017 -0700 @@ -303,9 +303,9 @@ out.close('link') out.open('link') - out.element('name', data='generated') + out.element('name', data='gensrc') out.element('type', data='2') - generated = join(_get_hotspot_build_dir(jvmVariant, debugLevel), 'generated') + generated = join(_get_hotspot_build_dir(jvmVariant, debugLevel), 'gensrc') out.element('locationURI', data=mx.get_eclipse_project_rel_locationURI(generated, eclProjectDir)) out.close('link') @@ -620,18 +620,12 @@ def _get_hotspot_build_dir(jvmVariant=None, debugLevel=None): """ Gets the directory in which a particular HotSpot configuration is built - (e.g., <JDK_REPO_ROOT>/build/macosx-x86_64-normal-server-release/hotspot/bsd_amd64_compiler2) + (e.g., <JDK_REPO_ROOT>/build/macosx-x86_64-normal-server-release/hotspot/variant-<variant>) """ if jvmVariant is None: jvmVariant = _vm.jvmVariant - os = mx.get_os() - if os == 'darwin': - os = 'bsd' - arch = mx.get_arch() - buildname = {'client': 'compiler1', 'server': 'compiler2'}.get(jvmVariant, jvmVariant) - - name = '{}_{}_{}'.format(os, arch, buildname) + name = 'variant-{}'.format(jvmVariant) return join(_get_jdk_build_dir(debugLevel=debugLevel), 'hotspot', name) class JVMCI9JDKConfig(mx.JDKConfig):