Browse Source

Make script quit when error happens in child processes.

Cheng Zhao 10 years ago
parent
commit
b93564894c
2 changed files with 12 additions and 7 deletions
  1. 3 1
      script/build.py
  2. 9 6
      script/update.py

+ 3 - 1
script/build.py

@@ -20,7 +20,9 @@ def main():
   args = parse_args()
   for config in args.configuration:
     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():

+ 9 - 6
script/update.py

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