Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci.py @ 22282:9ab88ee1f79f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling fix: instanciate -> instantiate
author Doug Simon <doug.simon@oracle.com>
date Wed, 22 Jul 2015 17:14:47 +0200
parents 2333f2f5baed
children 65eb572cbcb7
comparison
equal deleted inserted replaced
22281:2333f2f5baed 22282:9ab88ee1f79f
131 def _lib(l): 131 def _lib(l):
132 return mx.add_lib_suffix(mx.add_lib_prefix(l)) 132 return mx.add_lib_suffix(mx.add_lib_prefix(l))
133 133
134 class HotSpotVMJDKDeployedDist(JDKDeployedDist): 134 class HotSpotVMJDKDeployedDist(JDKDeployedDist):
135 def dist(self): 135 def dist(self):
136 name = mx.instanciatedDistributionName(self._name, dict(vm=get_vm(), vmbuild=_vmbuild), context=self._name) 136 name = mx.instantiatedDistributionName(self._name, dict(vm=get_vm(), vmbuild=_vmbuild), context=self._name)
137 return mx.distribution(name) 137 return mx.distribution(name)
138 138
139 def deploy(self, jdkDir): 139 def deploy(self, jdkDir):
140 _hs_deploy_map = { 140 _hs_deploy_map = {
141 'jvmti.h' : 'include', 141 'jvmti.h' : 'include',
235 235
236 def __enter__(self): 236 def __enter__(self):
237 global _vm, _vmbuild 237 global _vm, _vmbuild
238 self.previousVm = _vm 238 self.previousVm = _vm
239 self.previousBuild = _vmbuild 239 self.previousBuild = _vmbuild
240 mx.reInstanciateDistribution('JVM_<vmbuild>_<vm>', dict(vm=self.previousVm, vmbuild=self.previousBuild), dict(vm=self.vm, vmbuild=self.vmbuild)) 240 mx.reInstantiateDistribution('JVM_<vmbuild>_<vm>', dict(vm=self.previousVm, vmbuild=self.previousBuild), dict(vm=self.vm, vmbuild=self.vmbuild))
241 _vm = self.vm 241 _vm = self.vm
242 _vmbuild = self.build 242 _vmbuild = self.build
243 243
244 def __exit__(self, exc_type, exc_value, traceback): 244 def __exit__(self, exc_type, exc_value, traceback):
245 global _vm, _vmbuild 245 global _vm, _vmbuild
246 mx.reInstanciateDistribution('JVM_<vmbuild>_<vm>', dict(vm=self.vm, vmbuild=self.vmbuild), dict(vm=self.previousVm, vmbuild=self.previousBuild)) 246 mx.reInstantiateDistribution('JVM_<vmbuild>_<vm>', dict(vm=self.vm, vmbuild=self.vmbuild), dict(vm=self.previousVm, vmbuild=self.previousBuild))
247 _vm = self.previousVm 247 _vm = self.previousVm
248 _vmbuild = self.previousBuild 248 _vmbuild = self.previousBuild
249 249
250 def chmodRecursive(dirname, chmodFlagsDir): 250 def chmodRecursive(dirname, chmodFlagsDir):
251 if mx.get_os() == 'windows': 251 if mx.get_os() == 'windows':
2092 global _installed_jdks 2092 global _installed_jdks
2093 _installed_jdks = opts.installed_jdks 2093 _installed_jdks = opts.installed_jdks
2094 global _vm_prefix 2094 global _vm_prefix
2095 _vm_prefix = opts.vm_prefix 2095 _vm_prefix = opts.vm_prefix
2096 2096
2097 mx.instanciateDistribution('JVM_<vmbuild>_<vm>', dict(vmbuild=_vmbuild, vm=get_vm())) 2097 mx.instantiateDistribution('JVM_<vmbuild>_<vm>', dict(vmbuild=_vmbuild, vm=get_vm()))
2098 2098
2099 for jdkDist in jdkDeployedDists: 2099 for jdkDist in jdkDeployedDists:
2100 def _close(jdkDeployable): 2100 def _close(jdkDeployable):
2101 def _install(dist): 2101 def _install(dist):
2102 _installDistInJdks(jdkDeployable) 2102 _installDistInJdks(jdkDeployable)