Use the same python as the currently executing python to run scripts
This commit is contained in:
parent
6209c4a931
commit
efc36e50be
14
xenia-build
14
xenia-build
|
@ -318,7 +318,7 @@ def run_premake(target_os, action, cc=None):
|
||||||
action: action to preform.
|
action: action to preform.
|
||||||
"""
|
"""
|
||||||
ret = subprocess.call([
|
ret = subprocess.call([
|
||||||
'python',
|
sys.executable,
|
||||||
os.path.join('tools', 'build', 'premake'),
|
os.path.join('tools', 'build', 'premake'),
|
||||||
'--file=premake5.lua',
|
'--file=premake5.lua',
|
||||||
'--os=%s' % target_os,
|
'--os=%s' % target_os,
|
||||||
|
@ -973,7 +973,7 @@ class GpuTestCommand(BaseBuildCommand):
|
||||||
# Run tests.
|
# Run tests.
|
||||||
any_failed = False
|
any_failed = False
|
||||||
result = shell_call([
|
result = shell_call([
|
||||||
'python',
|
sys.executable,
|
||||||
os.path.join(self_path, 'tools', 'gpu-trace-diff'),
|
os.path.join(self_path, 'tools', 'gpu-trace-diff'),
|
||||||
'--executable=' + test_executables[0],
|
'--executable=' + test_executables[0],
|
||||||
'--trace_path=' + os.path.join(reference_trace_root, 'traces'),
|
'--trace_path=' + os.path.join(reference_trace_root, 'traces'),
|
||||||
|
@ -1118,7 +1118,7 @@ class LintCommand(Command):
|
||||||
file_path,
|
file_path,
|
||||||
], throw_on_error=False, stdout_path=difftemp)
|
], throw_on_error=False, stdout_path=difftemp)
|
||||||
shell_call([
|
shell_call([
|
||||||
'python',
|
sys.executable,
|
||||||
'tools/diff.py',
|
'tools/diff.py',
|
||||||
file_path,
|
file_path,
|
||||||
difftemp,
|
difftemp,
|
||||||
|
@ -1141,7 +1141,7 @@ class LintCommand(Command):
|
||||||
print('- git-clang-format --diff')
|
print('- git-clang-format --diff')
|
||||||
if os.path.exists(difftemp): os.remove(difftemp)
|
if os.path.exists(difftemp): os.remove(difftemp)
|
||||||
ret = shell_call([
|
ret = shell_call([
|
||||||
'python',
|
sys.executable,
|
||||||
'third_party/clang-format/git-clang-format',
|
'third_party/clang-format/git-clang-format',
|
||||||
'--binary=%s' % (clang_format_binary),
|
'--binary=%s' % (clang_format_binary),
|
||||||
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
||||||
|
@ -1157,7 +1157,7 @@ class LintCommand(Command):
|
||||||
any_errors = True
|
any_errors = True
|
||||||
print('')
|
print('')
|
||||||
shell_call([
|
shell_call([
|
||||||
'python',
|
sys.executable,
|
||||||
'third_party/clang-format/git-clang-format',
|
'third_party/clang-format/git-clang-format',
|
||||||
'--binary=%s' % (clang_format_binary),
|
'--binary=%s' % (clang_format_binary),
|
||||||
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
||||||
|
@ -1213,7 +1213,7 @@ class FormatCommand(Command):
|
||||||
else:
|
else:
|
||||||
print('- git-clang-format')
|
print('- git-clang-format')
|
||||||
shell_call([
|
shell_call([
|
||||||
'python',
|
sys.executable,
|
||||||
'third_party/clang-format/git-clang-format',
|
'third_party/clang-format/git-clang-format',
|
||||||
'--binary=%s' % (clang_format_binary),
|
'--binary=%s' % (clang_format_binary),
|
||||||
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
||||||
|
@ -1239,7 +1239,7 @@ class StyleCommand(Command):
|
||||||
if not file_path.endswith('_test.cc')]
|
if not file_path.endswith('_test.cc')]
|
||||||
print('- cpplint [%d files]' % (len(all_files)))
|
print('- cpplint [%d files]' % (len(all_files)))
|
||||||
ret = shell_call([
|
ret = shell_call([
|
||||||
'python',
|
sys.executable,
|
||||||
'third_party/google-styleguide/cpplint/cpplint.py',
|
'third_party/google-styleguide/cpplint/cpplint.py',
|
||||||
'--output=vs7',
|
'--output=vs7',
|
||||||
'--linelength=80',
|
'--linelength=80',
|
||||||
|
|
Loading…
Reference in New Issue