Mercurial > hg > truffle

comparison mx/mx_graal.py @ 18876:c446d00f2cdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: added support for Jython 2.7b3 and made ordering in generated files more deterministic\nContributed-by: Igor Ignatyev <igor.ignatyev@oracle.com>
author Doug Simon <doug.simon@oracle.com>
date Sat, 17 Jan 2015 11:26:18 +0100
parents fe4f875e435f
children 19d99eec8876
comparison
equal deleted inserted replaced
18875:d71bf1009d71 18876:c446d00f2cdf
24 # or visit www.oracle.com if you need additional information or have any 24 # or visit www.oracle.com if you need additional information or have any
25 # questions. 25 # questions.
26 # 26 #
27 # ---------------------------------------------------------------------------------------------------- 27 # ----------------------------------------------------------------------------------------------------
28 28
29 import os, stat, errno, sys, shutil, zipfile, tarfile, tempfile, re, time, datetime, platform, subprocess, multiprocessing, StringIO, socket 29 import os, stat, errno, sys, shutil, zipfile, tarfile, tempfile, re, time, datetime, platform, subprocess, StringIO, socket
30 from os.path import join, exists, dirname, basename 30 from os.path import join, exists, dirname, basename
31 from argparse import ArgumentParser, RawDescriptionHelpFormatter, REMAINDER 31 from argparse import ArgumentParser, RawDescriptionHelpFormatter, REMAINDER
32 from outputparser import OutputParser, ValuesMatcher 32 from outputparser import OutputParser, ValuesMatcher
33 import hashlib 33 import hashlib
34 import mx 34 import mx
695 """describe the variables that can be set by the -D option to the 'mx build' commmand""" 695 """describe the variables that can be set by the -D option to the 'mx build' commmand"""
696 696
697 buildVars = { 697 buildVars = {
698 'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.java().jdk + ')', 698 'ALT_BOOTDIR' : 'The location of the bootstrap JDK installation (default: ' + mx.java().jdk + ')',
699 'ALT_OUTPUTDIR' : 'Build directory', 699 'ALT_OUTPUTDIR' : 'Build directory',
700 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(multiprocessing.cpu_count()) + ')', 700 'HOTSPOT_BUILD_JOBS' : 'Number of CPUs used by make (default: ' + str(mx.cpu_count()) + ')',
701 'INSTALL' : 'Install the built VM into the JDK? (default: y)', 701 'INSTALL' : 'Install the built VM into the JDK? (default: y)',
702 'ZIP_DEBUGINFO_FILES' : 'Install zipped debug symbols file? (default: 0)', 702 'ZIP_DEBUGINFO_FILES' : 'Install zipped debug symbols file? (default: 0)',
703 } 703 }
704 704
705 mx.log('HotSpot build variables that can be set by the -D option to "mx build":') 705 mx.log('HotSpot build variables that can be set by the -D option to "mx build":')
886 winBuildCmd = 'msbuild ' + t_graal_home + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64' 886 winBuildCmd = 'msbuild ' + t_graal_home + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=' + project_config + ' /p:Platform=x64'
887 if not _runInDebugShell(winBuildCmd, t_graal_home, t_compilelogfile): 887 if not _runInDebugShell(winBuildCmd, t_graal_home, t_compilelogfile):
888 mx.log('Error building project') 888 mx.log('Error building project')
889 return 889 return
890 else: 890 else:
891 cpus = multiprocessing.cpu_count() 891 cpus = mx.cpu_count()
892 makeDir = join(_graal_home, 'make') 892 makeDir = join(_graal_home, 'make')
893 runCmd = [mx.gmake_cmd(), '-C', makeDir] 893 runCmd = [mx.gmake_cmd(), '-C', makeDir]
894 894
895 env = os.environ.copy() 895 env = os.environ.copy()
896 896