Mercurial > hg > graal-compiler

comparison mx/mx_graal.py @ 17015:ffddcdca8e74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: support different name for jvm.cfg
author Bernhard Urban <bernhard.urban@jku.at>
date Tue, 02 Sep 2014 14:47:10 +0200
parents 6a30738791f7
children 35fda668ed6e
comparison
equal deleted inserted replaced
17014:6a30738791f7 17015:ffddcdca8e74
365 return [join(jdk, 'jre', 'lib', 'jli')] 365 return [join(jdk, 'jre', 'lib', 'jli')]
366 if platform.system() == 'Windows': 366 if platform.system() == 'Windows':
367 return [join(jdk, 'jre', 'bin'), join(jdk, 'bin')] 367 return [join(jdk, 'jre', 'bin'), join(jdk, 'bin')]
368 return [join(jdk, 'jre', 'lib', mx.get_arch(), 'jli'), join(jdk, 'lib', mx.get_arch(), 'jli')] 368 return [join(jdk, 'jre', 'lib', mx.get_arch(), 'jli'), join(jdk, 'lib', mx.get_arch(), 'jli')]
369 369
370 def _vmCfgInJdk(jdk): 370 def _vmCfgInJdk(jdk, jvmCfgFile='jvm.cfg'):
371 """ 371 """
372 Get the jvm.cfg file. 372 Get the jvm.cfg file.
373 """ 373 """
374 if platform.system() == 'Windows': 374 if platform.system() == 'Windows':
375 return join(jdk, 'jre', 'lib', mx.get_arch(), 'jvm.cfg') 375 return join(jdk, 'jre', 'lib', mx.get_arch(), jvmCfgFile)
376 return join(_vmLibDirInJdk(jdk), 'jvm.cfg') 376 return join(_vmLibDirInJdk(jdk), jvmCfgFile)
377 377
378 def _jdksDir(): 378 def _jdksDir():
379 return os.path.abspath(join(_installed_jdks if _installed_jdks else _graal_home, 'jdk' + str(mx.java().version))) 379 return os.path.abspath(join(_installed_jdks if _installed_jdks else _graal_home, 'jdk' + str(mx.java().version)))
380 380
381 def _handle_missing_VM(bld, vm): 381 def _handle_missing_VM(bld, vm):