diff --git a/brightray/script/bootstrap b/brightray/script/bootstrap index e865c1644a..23b33ca62d 100755 --- a/brightray/script/bootstrap +++ b/brightray/script/bootstrap @@ -15,13 +15,15 @@ DOWNLOAD_DIR = os.path.join(VENDOR_DIR, 'download') def main(): args = parse_args() return (update_submodules() or - download_libchromiumcontent(args.commit, args.url)) + download_libchromiumcontent(args.dev, args.commit, args.url)) def parse_args(): parser = argparse.ArgumentParser(description='Bootstrap this project') parser.add_argument('-c', '--commit', nargs='?', default='HEAD', help='The commit of libchromiumcontent to download.') + parser.add_argument('-d', '--dev', action='store_true', + help='Do not download static_library build') parser.add_argument('url', help='The base URL from which to download ' 'libchromiumcontent (i.e., the URL you passed to ' 'libchromiumcontent\'s script/upload script') @@ -35,12 +37,16 @@ def update_submodules(): '--recursive'])) -def download_libchromiumcontent(commit, url): +def download_libchromiumcontent(is_dev, commit, url): mkdir_p(DOWNLOAD_DIR) download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script', 'download') - return subprocess.call([sys.executable, download, '-f', '-c', commit, url, - os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')]) + target = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent') + subprocess.check_call([sys.executable, download, '-f', '-c', commit, url, + target]) + if not is_dev: + subprocess.check_call([sys.executable, download, '-s', '-f', '-c', commit, + url, target]) def mkdir_p(path): diff --git a/brightray/vendor/libchromiumcontent b/brightray/vendor/libchromiumcontent index 846a13ae22..1b7aec028c 160000 --- a/brightray/vendor/libchromiumcontent +++ b/brightray/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 846a13ae2234490d78568a68f07f5be95c24c0c3 +Subproject commit 1b7aec028cf86463bc6c00ce15e294cdd157b5c1