Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci.py @ 22287:5cce6c398d70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
re-introduced partOfHotSpot to JarJDKDeployedDist to fix mx_jvmci_makefile.py
author Doug Simon <doug.simon@oracle.com>
date Thu, 23 Jul 2015 15:21:13 +0200
parents 2ecfec90e51e
children 5425cd72bd3a
comparison
equal deleted inserted replaced
22286:2ecfec90e51e 22287:5cce6c398d70
91 91
92 def deploy(self, jdkDir): 92 def deploy(self, jdkDir):
93 mx.nyi('deploy', self) 93 mx.nyi('deploy', self)
94 94
95 class JarJDKDeployedDist(JDKDeployedDist): 95 class JarJDKDeployedDist(JDKDeployedDist):
96 def __init__(self, name, partOfHotSpot=False):
97 JDKDeployedDist.__init__(self, name)
98 self.partOfHotSpot = partOfHotSpot
99
96 def targetDir(self): 100 def targetDir(self):
97 mx.nyi('targetDir', self) 101 mx.nyi('targetDir', self)
98 102
99 def _copyToJdk(self, jdkDir, target): 103 def _copyToJdk(self, jdkDir, target):
100 targetDir = join(jdkDir, target) 104 targetDir = join(jdkDir, target)
106 110
107 def deploy(self, jdkDir): 111 def deploy(self, jdkDir):
108 self._copyToJdk(jdkDir, self.targetDir()) 112 self._copyToJdk(jdkDir, self.targetDir())
109 113
110 class ExtJDKDeployedDist(JarJDKDeployedDist): 114 class ExtJDKDeployedDist(JarJDKDeployedDist):
115 def __init__(self, name, partOfHotSpot=False):
116 JarJDKDeployedDist.__init__(self, name, partOfHotSpot)
117
111 def targetDir(self): 118 def targetDir(self):
112 return join('jre', 'lib', 'ext') 119 return join('jre', 'lib', 'ext')
113 120
114 class LibJDKDeployedDist(JarJDKDeployedDist): 121 class LibJDKDeployedDist(JarJDKDeployedDist):
122 def __init__(self, name, partOfHotSpot=False):
123 JarJDKDeployedDist.__init__(self, name, partOfHotSpot)
124
115 def targetDir(self): 125 def targetDir(self):
116 return join('jre', 'lib') 126 return join('jre', 'lib')
117 127
118 class JvmciJDKDeployedDist(JarJDKDeployedDist): 128 class JvmciJDKDeployedDist(JarJDKDeployedDist):
129 def __init__(self, name, partOfHotSpot=False):
130 JarJDKDeployedDist.__init__(self, name, partOfHotSpot)
131
119 def targetDir(self): 132 def targetDir(self):
120 return join('jre', 'lib', 'jvmci') 133 return join('jre', 'lib', 'jvmci')
121 134
122 def deploy(self, jdkDir): 135 def deploy(self, jdkDir):
123 JarJDKDeployedDist.deploy(self, jdkDir) 136 JarJDKDeployedDist.deploy(self, jdkDir)
153 updateJvmCfg(jdkDir, get_vm()) 166 updateJvmCfg(jdkDir, get_vm())
154 """ 167 """
155 List of distributions that are deployed into a JDK by mx. 168 List of distributions that are deployed into a JDK by mx.
156 """ 169 """
157 jdkDeployedDists = [ 170 jdkDeployedDists = [
158 LibJDKDeployedDist('JVMCI_SERVICE'), 171 LibJDKDeployedDist('JVMCI_SERVICE', partOfHotSpot=True),
159 JvmciJDKDeployedDist('JVMCI_API'), 172 JvmciJDKDeployedDist('JVMCI_API', partOfHotSpot=True),
160 JvmciJDKDeployedDist('JVMCI_HOTSPOT'), 173 JvmciJDKDeployedDist('JVMCI_HOTSPOT', partOfHotSpot=True),
161 HotSpotVMJDKDeployedDist('JVM_<vmbuild>_<vm>'), 174 HotSpotVMJDKDeployedDist('JVM_<vmbuild>_<vm>'),
162 ] 175 ]
163 176
164 JDK_UNIX_PERMISSIONS_DIR = 0755 177 JDK_UNIX_PERMISSIONS_DIR = 0755
165 JDK_UNIX_PERMISSIONS_FILE = 0644 178 JDK_UNIX_PERMISSIONS_FILE = 0644