mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Make script quit when error happens in child processes.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-08 23:23:56 +08:00
parent 54b8a62920
commit b93564894c
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/build.py
View file

@ -20,7 +20,9 @@ def main():
args = parse_args() args = parse_args()
for config in args.configuration: for config in args.configuration:
build_path = os.path.join('out', config) build_path = os.path.join('out', config)
subprocess.call([ninja, '-C', build_path, args.target]) ret = subprocess.call([ninja, '-C', build_path, args.target])
if ret != 0:
sys.exit(ret)
def parse_args(): def parse_args():

15
script/update.py
View file

@ -35,12 +35,15 @@ def update_gyp():
if sys.platform == 'cygwin': if sys.platform == 'cygwin':
# Force using win32 python on cygwin. # Force using win32 python on cygwin.
python = os.path.join('vendor', 'python_26', 'python.exe') python = os.path.join('vendor', 'python_26', 'python.exe')
subprocess.call([python, gyp,
'-f', 'ninja', '--depth', '.', 'atom.gyp', ret = subprocess.call([python, gyp,
'-Icommon.gypi', '-Ivendor/brightray/brightray.gypi', '-f', 'ninja', '--depth', '.', 'atom.gyp',
'-Dlinux_clang=0', # Disable brightray's clang setting '-Icommon.gypi', '-Ivendor/brightray/brightray.gypi',
'-Dtarget_arch={0}'.format(arch), '-Dlinux_clang=0', # Disable brightray's clang setting
'-Dlibrary=static_library']) '-Dtarget_arch={0}'.format(arch),
'-Dlibrary=static_library'])
if ret != 0:
sys.exit(ret)
if __name__ == '__main__': if __name__ == '__main__':