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

Allow specifying the arch of libchromiumcontent to download

Browse source
This commit is contained in:
Cheng Zhao 2015-04-11 16:59:44 +08:00
parent 252ac465c5
commit ca50cbb5ff
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -10,4 +10,5 @@ node_modules/
*.xcodeproj *.xcodeproj
*.swp *.swp
*.pyc *.pyc
debug.log
npm-debug.log npm-debug.log

18
script/bootstrap.py
View file

@ -4,7 +4,7 @@ import argparse
import os import os
import sys import sys
from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, \ from lib.config import LIBCHROMIUMCONTENT_COMMIT, BASE_URL, TARGET_PLATFORM, \
enable_verbose_mode, is_verbose_mode enable_verbose_mode, is_verbose_mode
from lib.util import execute_stdout, scoped_cwd from lib.util import execute_stdout, scoped_cwd
@ -19,8 +19,7 @@ def main():
os.chdir(SOURCE_ROOT) os.chdir(SOURCE_ROOT)
args = parse_args() args = parse_args()
if (args.yes is False and if not args.yes and TARGET_PLATFORM != 'win32':
sys.platform not in ('win32', 'cygwin')):
check_root() check_root()
if args.verbose: if args.verbose:
enable_verbose_mode() enable_verbose_mode()
@ -28,7 +27,7 @@ def main():
update_win32_python() update_win32_python()
update_submodules() update_submodules()
update_node_modules('.') update_node_modules('.')
bootstrap_brightray(args.dev, args.url) bootstrap_brightray(args.dev, args.url, args.target_arch)
create_chrome_version_h() create_chrome_version_h()
touch_config_gypi() touch_config_gypi()
@ -53,8 +52,11 @@ def parse_args():
action='store_true', action='store_true',
help='Run non-interactively by assuming "yes" to all ' \ help='Run non-interactively by assuming "yes" to all ' \
'prompts.') 'prompts.')
parser.add_argument('--target_arch', default='default',
help='Manually specify the arch to build for')
return parser.parse_args() return parser.parse_args()
def check_root(): def check_root():
if os.geteuid() == 0: if os.geteuid() == 0:
print "We suggest not running this as root, unless you're really sure." print "We suggest not running this as root, unless you're really sure."
@ -68,9 +70,13 @@ def update_submodules():
execute_stdout(['git', 'submodule', 'update', '--init', '--recursive']) execute_stdout(['git', 'submodule', 'update', '--init', '--recursive'])
def bootstrap_brightray(is_dev, url): def bootstrap_brightray(is_dev, url, target_arch):
bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap') bootstrap = os.path.join(VENDOR_DIR, 'brightray', 'script', 'bootstrap')
args = ['--commit', LIBCHROMIUMCONTENT_COMMIT, url] args = [
'--commit', LIBCHROMIUMCONTENT_COMMIT,
'--target_arch', target_arch,
url,
]
if is_dev: if is_dev:
args = ['--dev'] + args args = ['--dev'] + args
execute_stdout([sys.executable, bootstrap] + args) execute_stdout([sys.executable, bootstrap] + args)

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit f2b33daa4ea5a1e1ba0a5b18a3f0470d99b6f962 Subproject commit f44a3834690c010a1841cde92ca5e4798b1c9d2f