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

Added a verbose mode to the bootstrap script

Browse source
This commit is contained in:
Corne Dorrestijn 2014-08-12 14:23:59 +02:00
parent 72e8b2882f
commit 0018d4b705
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
script/bootstrap.py
View file

@ -5,7 +5,7 @@ import os
import sys import sys
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, NODE_VERSION
from lib.util import execute, scoped_cwd from lib.util import execute, scoped_cwd, enable_verbose_execute
SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
@ -18,6 +18,8 @@ def main():
os.chdir(SOURCE_ROOT) os.chdir(SOURCE_ROOT)
args = parse_args() args = parse_args()
if args.verbose:
enable_verbose_execute()
update_submodules() update_submodules()
update_node_modules('.') update_node_modules('.')
update_atom_modules('atom/browser/default_app') update_atom_modules('atom/browser/default_app')
@ -32,7 +34,6 @@ def main():
touch_config_gypi() touch_config_gypi()
update_atom_shell() update_atom_shell()
def parse_args(): def parse_args():
parser = argparse.ArgumentParser(description='Bootstrap this project') parser = argparse.ArgumentParser(description='Bootstrap this project')
parser.add_argument('-u', '--url', parser.add_argument('-u', '--url',
@ -41,9 +42,11 @@ def parse_args():
'libchromiumcontent\'s script/upload script', 'libchromiumcontent\'s script/upload script',
default=BASE_URL, default=BASE_URL,
required=False) required=False)
parser.add_argument('-v', '--verbose',
action='store_true',
help='Prints the output of the subprocesses')
return parser.parse_args() return parser.parse_args()
def update_submodules(): def update_submodules():
execute(['git', 'submodule', 'sync']) execute(['git', 'submodule', 'sync'])
execute(['git', 'submodule', 'update', '--init', '--recursive']) execute(['git', 'submodule', 'update', '--init', '--recursive'])

10
script/lib/util.py
View file

@ -12,12 +12,17 @@ import urllib2
import os import os
import zipfile import zipfile
verbose_mode = False
def tempdir(prefix=''): def tempdir(prefix=''):
directory = tempfile.mkdtemp(prefix=prefix) directory = tempfile.mkdtemp(prefix=prefix)
atexit.register(shutil.rmtree, directory) atexit.register(shutil.rmtree, directory)
return directory return directory
def enable_verbose_execute():
print 'Running in verbose mode'
global verbose_mode
verbose_mode = True
@contextlib.contextmanager @contextlib.contextmanager
def scoped_cwd(path): def scoped_cwd(path):
@ -126,7 +131,10 @@ def safe_mkdir(path):
def execute(argv): def execute(argv):
try: try:
return subprocess.check_output(argv, stderr=subprocess.STDOUT) output = subprocess.check_output(argv, stderr=subprocess.STDOUT)
if verbose_mode:
print output
return output
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print e.output print e.output
raise e raise e