RFR (S): 8180453: mx eclipseinit doesn't pick up generated sources (original) (raw)

Christian Thalinger cthalinger at twitter.com
Tue May 16 23:32:51 UTC 2017

On May 16, 2017, at 1:29 PM, Vladimir Kozlov <vladimir.kozlov at oracle.com> wrote:

JDK 9 or JDK 10?

Both.

Changes are fine but you need approval for JDK 9.

How? Bunch of labels, I guess? :-)

Thanks, Vladimir On 5/16/17 4:17 PM, Christian Thalinger wrote: https://bugs.openjdk.java.net/browse/JDK-8180453 <https://bugs.openjdk.java.net/browse/JDK-8180453>

The fix is trivial and does not affect production code. diff --git a/.mx.jvmci/mxjvmci.py b/.mx.jvmci/mxjvmci.py index b87bab7..37a9baf 100644 --- a/.mx.jvmci/mxjvmci.py +++ b/.mx.jvmci/mxjvmci.py @@ -303,9 +303,9 @@ class HotSpotProject(mx.NativeProject): out.close('link') out.open('link') - out.element('name', data='generated') + out.element('name', data='gensrc') out.element('type', data='2') - generated = join(gethotspotbuilddir(jvmVariant, debugLevel), 'generated') + generated = join(gethotspotbuilddir(jvmVariant, debugLevel), 'gensrc') out.element('locationURI', data=mx.geteclipseprojectrellocationURI(generated, eclProjectDir)) out.close('link') @@ -620,18 +620,12 @@ jvmcibootclasspathprepends = [] def gethotspotbuilddir(jvmVariant=None, debugLevel=None): """ Gets the directory in which a particular HotSpot configuration is built - (e.g., /build/macosx-x8664-normal-server-release/hotspot/bsdamd64compiler2) + (e.g., /build/macosx-x8664-normal-server-release/hotspot/variant-) """ if jvmVariant is None: jvmVariant = vm.jvmVariant - os = mx.getos() - if os == 'darwin': - os = 'bsd' - arch = mx.getarch() - buildname = {'client': 'compiler1', 'server': 'compiler2'}.get(jvmVariant, jvmVariant) - - name = '{}{}{}'.format(os, arch, buildname) + name = 'variant-{}'.format(jvmVariant) return join(getjdkbuilddir(debugLevel=debugLevel), 'hotspot', name) class JVMCI9JDKConfig(mx.JDKConfig):

More information about the hotspot-dev mailing list