ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No shell, try new git on travis.

This commit is contained in:
Ben Vanik 2015-08-01 00:20:12 -07:00
parent 90ca7966f7
commit 741685d7e8
2 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_tools

@ -1 +1 @@
Subproject commit 9b829e85822c21a9ff0a3d0f9c31a68daf7cfd3f Subproject commit 5abc3a9decb130c9f8d79f29048bfc73f71f859e

53
xenia-build
View File

@ -168,10 +168,10 @@ def shell_call(command, throw_on_error=True, stdout_path=None):
try: try:
if throw_on_error: if throw_on_error:
result = 1 result = 1
subprocess.check_call(command, shell=True, stdout=stdout_file) subprocess.check_call(command, shell=False, stdout=stdout_file)
result = 0 result = 0
else: else:
result = subprocess.call(command, shell=True, stdout=stdout_file) result = subprocess.call(command, shell=False, stdout=stdout_file)
finally: finally:
if stdout_file: if stdout_file:
stdout_file.close() stdout_file.close()
@ -184,26 +184,35 @@ def git_submodule_update():
Older versions of git do not support 'update --init --recursive'. We could Older versions of git do not support 'update --init --recursive'. We could
check and run it on versions that do support it and speed things up a bit. check and run it on versions that do support it and speed things up a bit.
""" """
shell_call([ if True:
'git', shell_call([
'submodule', 'git',
'init', 'submodule',
]) 'update',
shell_call([ '--init',
'git', '--recursive',
'submodule', ])
'foreach', else:
'--recursive', shell_call([
'git', 'git',
'submodule', 'submodule',
'init', 'init',
]) ])
shell_call([ shell_call([
'git', 'git',
'submodule', 'submodule',
'update', 'foreach',
'--recursive', '--recursive',
]) 'git',
'submodule',
'init',
])
shell_call([
'git',
'submodule',
'update',
'--recursive',
])
def run_premake(target_os, action): def run_premake(target_os, action):