Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci.py @ 22330:856aeb17e892

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add debug info files in hotspot's results
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Thu, 23 Jul 2015 11:44:06 +0200
parents 3a95164b033c
children c9eefaa577f6
comparison
equal deleted inserted replaced
22329:6dc8c13bf1c7 22330:856aeb17e892
137 _updateJVMCIFiles(jdkDir) 137 _updateJVMCIFiles(jdkDir)
138 138
139 def _exe(l): 139 def _exe(l):
140 return mx.exe_suffix(l) 140 return mx.exe_suffix(l)
141 141
142
143 def _lib(l): 142 def _lib(l):
144 return mx.add_lib_suffix(mx.add_lib_prefix(l)) 143 return mx.add_lib_suffix(mx.add_lib_prefix(l))
144
145 def _lib_dbg(l):
146 return mx.add_debug_lib_suffix(mx.add_lib_prefix(l))
145 147
146 class HotSpotVMJDKDeployedDist(JDKDeployedDist): 148 class HotSpotVMJDKDeployedDist(JDKDeployedDist):
147 def dist(self): 149 def dist(self):
148 name = mx.instantiatedDistributionName(self._name, dict(vm=get_vm(), vmbuild=_vmbuild), context=self._name) 150 name = mx.instantiatedDistributionName(self._name, dict(vm=get_vm(), vmbuild=_vmbuild), context=self._name)
149 return mx.distribution(name) 151 return mx.distribution(name)
151 def deploy(self, jdkDir): 153 def deploy(self, jdkDir):
152 _hs_deploy_map = { 154 _hs_deploy_map = {
153 'jvmti.h' : 'include', 155 'jvmti.h' : 'include',
154 'sa-jdi.jar' : 'lib', 156 'sa-jdi.jar' : 'lib',
155 _lib('jvm') : join(relativeVmLibDirInJdk(), get_vm()), 157 _lib('jvm') : join(relativeVmLibDirInJdk(), get_vm()),
158 _lib_dbg('jvm') : join(relativeVmLibDirInJdk(), get_vm()),
156 _lib('saproc') : relativeVmLibDirInJdk(), 159 _lib('saproc') : relativeVmLibDirInJdk(),
160 _lib_dbg('saproc') : relativeVmLibDirInJdk(),
157 _lib('jsig') : relativeVmLibDirInJdk(), 161 _lib('jsig') : relativeVmLibDirInJdk(),
162 _lib_dbg('jsig') : relativeVmLibDirInJdk(),
158 } 163 }
159 dist = self.dist() 164 dist = self.dist()
160 with tarfile.open(dist.path, 'r') as tar: 165 with tarfile.open(dist.path, 'r') as tar:
161 for m in tar.getmembers(): 166 for m in tar.getmembers():
162 if m.name in _hs_deploy_map: 167 if m.name in _hs_deploy_map: