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

Only build static_library version of libchromiumcontent in CI

Browse source
This commit is contained in:
Cheng Zhao 2015-04-07 23:40:36 +08:00
parent 105aec4ea9
commit 1a36770286
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
script/bootstrap.py
View file

@ -28,7 +28,7 @@ def main():
update_win32_python() update_win32_python()
update_submodules() update_submodules()
update_node_modules('.') update_node_modules('.')
bootstrap_brightray(args.url) bootstrap_brightray(args.dev, args.url)
create_chrome_version_h() create_chrome_version_h()
touch_config_gypi() touch_config_gypi()
@ -47,6 +47,8 @@ def parse_args():
parser.add_argument('-v', '--verbose', parser.add_argument('-v', '--verbose',
action='store_true', action='store_true',
help='Prints the output of the subprocesses') help='Prints the output of the subprocesses')
parser.add_argument('-d', '--dev', action='store_true',
help='Do not download static_library build')
parser.add_argument('-y', '--yes', '--assume-yes', parser.add_argument('-y', '--yes', '--assume-yes',
action='store_true', action='store_true',
help='Run non-interactively by assuming "yes" to all ' \ help='Run non-interactively by assuming "yes" to all ' \
@ -66,10 +68,12 @@ def update_submodules():
execute_stdout(['git', 'submodule', 'update', '--init', '--recursive']) execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
def bootstrap_brightray(url): def bootstrap_brightray(is_dev, url):
bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap') bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap')
execute_stdout([sys.executable, bootstrap, '--commit', args = ['--commit', LIBCHROMIUMCONTENT_COMMIT, url]
LIBCHROMIUMCONTENT_COMMIT, url]) if is_dev:
args = ['--dev'] + args
execute_stdout([sys.executable, bootstrap] + args)
def update_node_modules(dirname): def update_node_modules(dirname):

4
script/cibuild
View file

@ -43,10 +43,10 @@ def main():
if is_travis and sys.platform == 'linux2': if is_travis and sys.platform == 'linux2':
with scoped_env('CXX', 'g++'): with scoped_env('CXX', 'g++'):
with scoped_env('CC', 'gcc'): with scoped_env('CC', 'gcc'):
run_script('bootstrap.py') run_script('bootstrap.py', ['-v', '--dev'])
run_script('update.py') run_script('update.py')
else: else:
run_script('bootstrap.py') run_script('bootstrap.py', ['-v', '--dev'])
run_script('cpplint.py') run_script('cpplint.py')
if sys.platform != 'win32': if sys.platform != 'win32':

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 616ce9051fef9896651686aa9a0b6403caa4e1a8 Subproject commit e1304edb03ac774d1386be19bcced0822aabbc70