Mercurial > hg > graal-jvmci-8

comparison mx/mx_graal.py @ 21607:71b338926f2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved JVMCI classes into their own distributions (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Fri, 29 May 2015 22:27:38 +0200
parents 93f282187d90
children 60154926b513
comparison
equal deleted inserted replaced
21606:625b2b12b418 21607:71b338926f2e
93 self.isExtension = isExtension 93 self.isExtension = isExtension
94 self.usesJVMCIClassLoader = usesJVMCIClassLoader 94 self.usesJVMCIClassLoader = usesJVMCIClassLoader
95 95
96 _jdkDeployedDists = [ 96 _jdkDeployedDists = [
97 JDKDeployedDist('TRUFFLE'), 97 JDKDeployedDist('TRUFFLE'),
98 JDKDeployedDist('JVMCI_LOADER'), 98 JDKDeployedDist('JVMCI_SERVICE'),
99 JDKDeployedDist('JVMCI_API', usesJVMCIClassLoader=True),
100 JDKDeployedDist('JVMCI_HOTSPOT', usesJVMCIClassLoader=True),
99 JDKDeployedDist('GRAAL', usesJVMCIClassLoader=True), 101 JDKDeployedDist('GRAAL', usesJVMCIClassLoader=True),
100 JDKDeployedDist('GRAAL_TRUFFLE', usesJVMCIClassLoader=True) 102 JDKDeployedDist('GRAAL_TRUFFLE', usesJVMCIClassLoader=True)
101 ] 103 ]
102 104
103 JDK_UNIX_PERMISSIONS_DIR = 0755 105 JDK_UNIX_PERMISSIONS_DIR = 0755
665 os.chmod(target, JDK_UNIX_PERMISSIONS_FILE) 667 os.chmod(target, JDK_UNIX_PERMISSIONS_FILE)
666 return (jvmciServices, optionsFiles) 668 return (jvmciServices, optionsFiles)
667 669
668 def _updateJVMCIFiles(jdkDir): 670 def _updateJVMCIFiles(jdkDir):
669 jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci') 671 jreJVMCIDir = join(jdkDir, 'jre', 'lib', 'jvmci')
670 graalJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.startswith('graal') and e.endswith('.jar')] 672 jvmciJars = [join(jreJVMCIDir, e) for e in os.listdir(jreJVMCIDir) if e.endswith('.jar')]
671 jreGraalServicesDir = join(jreJVMCIDir, 'services') 673 jreGraalServicesDir = join(jreJVMCIDir, 'services')
672 jreGraalOptionsDir = join(jreJVMCIDir, 'options') 674 jreGraalOptionsDir = join(jreJVMCIDir, 'options')
673 _extractJVMCIFiles(graalJars, jreGraalServicesDir, jreGraalOptionsDir) 675 _extractJVMCIFiles(jvmciJars, jreGraalServicesDir, jreGraalOptionsDir)
674 676
675 def _patchGraalVersionConstant(dist): 677 def _patchGraalVersionConstant(dist):
676 """ 678 """
677 Patches the constant "@@graal.version@@" in the constant pool of Graal.class 679 Patches the constant "@@graal.version@@" in the constant pool of Graal.class
678 with the computed Graal version string. 680 with the computed Graal version string.