Mercurial > hg > truffle
comparison mx/mx_graal.py @ 21687:afea1d08c393
Merge with df4579cb9503128c646bd04e66646ccfa7faf25f
author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
---|---|
date | Tue, 02 Jun 2015 18:32:11 -0700 |
parents | 8d0c2aabfc2d |
children | dd987b035a0b |
comparison
equal
deleted
inserted
replaced
21686:5fa7935c5de3 | 21687:afea1d08c393 |
---|---|
612 return (jvmciServices, optionsFiles) | 612 return (jvmciServices, optionsFiles) |
613 | 613 |
614 def _updateJVMCIFiles(jdkDir): | 614 def _updateJVMCIFiles(jdkDir): |
615 jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci') | 615 jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci') |
616 jvmciJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.endswith('.jar')] | 616 jvmciJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.endswith('.jar')] |
617 jreGraalServicesDir = join(jreJVMCIDir, 'services') | 617 jreJVMCIServicesDir = join(jreJVMCIDir, 'services') |
618 jreGraalOptionsDir = join(jreJVMCIDir, 'options') | 618 jreJVMCIOptionsDir = join(jreJVMCIDir, 'options') |
619 _extractJVMCIFiles(_getJdkDeployedJars(jdkDir), jvmciJars, jreGraalServicesDir, jreGraalOptionsDir) | 619 _extractJVMCIFiles(_getJdkDeployedJars(jdkDir), jvmciJars, jreJVMCIServicesDir, jreJVMCIOptionsDir) |
620 | 620 |
621 def _patchGraalVersionConstant(dist): | 621 def _patchGraalVersionConstant(dist): |
622 """ | 622 """ |
623 Patches the constant "@@graal.version@@" in the constant pool of Graal.class | 623 Patches the constant "@@graal.version@@" in the constant pool of Graal.class |
624 with the computed Graal version string. | 624 with the computed Graal version string. |