Mercurial > hg > truffle

comparison mx/commands.py @ 11287:a09587890e58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: don't include jdk build directory in path for vmdir
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 12 Aug 2013 11:56:35 +0200
parents 485a5f029b32
children 4e943a311d9c
comparison
equal deleted inserted replaced
11286:485a5f029b32 11287:a09587890e58
267 if platform.system() == 'Windows': 267 if platform.system() == 'Windows':
268 return join(jdk, 'jre', 'lib', _arch(), 'jvm.cfg') 268 return join(jdk, 'jre', 'lib', _arch(), 'jvm.cfg')
269 return join(_vmLibDirInJdk(jdk), 'jvm.cfg') 269 return join(_vmLibDirInJdk(jdk), 'jvm.cfg')
270 270
271 def _jdksDir(): 271 def _jdksDir():
272 return os.path.abspath(_vmdir if _vmdir else join(_graal_home, 'jdk' + str(mx.java().version))) 272 return os.path.abspath(join(_vmdir if _vmdir else _graal_home, 'jdk' + str(mx.java().version)))
273 273
274 def _jdk(build='product', vmToCheck=None, create=False, installGraalJar=True): 274 def _jdk(build='product', vmToCheck=None, create=False, installGraalJar=True):
275 """ 275 """
276 Get the JDK into which Graal is installed, creating it first if necessary. 276 Get the JDK into which Graal is installed, creating it first if necessary.
277 """ 277 """