From 90d142b6415c316b7b1af00bf72788a2f03e01e1 Mon Sep 17 00:00:00 2001 From: tejaspathak Date: Tue, 10 Nov 2015 23:26:42 +0900 Subject: [PATCH] Fix build error --- brightray/script/bootstrap | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/brightray/script/bootstrap b/brightray/script/bootstrap index 3d06ebbb45be..e0f373cecf32 100755 --- a/brightray/script/bootstrap +++ b/brightray/script/bootstrap @@ -29,7 +29,8 @@ def main(): elif (args.libcc_source_path != None or args.libcc_shared_library_path != None or args.libcc_static_library_path != None): - print "Error: All options of libchromiumcontent are required OR let brightray choose it" + print "Error: All options of libchromiumcontent are required OR let " \ + "brightray choose it" sys.exit(0) update_submodules() setup_libchromiumcontent(args.dev, args.commit, args.target_arch, args.url, @@ -50,11 +51,17 @@ def parse_args(): 'libchromiumcontent (i.e., the URL you passed to ' 'libchromiumcontent\'s script/upload script') parser.add_argument('--libcc_source_path', required=False, - help='The source path of libchromiumcontent. NOTE: All options of libchromiumcontent are required OR let brightray choose it') + help='The source path of libchromiumcontent. ' \ + 'NOTE: All options of libchromiumcontent are ' + 'required OR let brightray choose it') parser.add_argument('--libcc_shared_library_path', required=False, - help='The shared library path of libchromiumcontent. NOTE: All options of libchromiumcontent are required OR let brightray choose it') + help='The shared library path of libchromiumcontent. ' \ + 'NOTE: All options of libchromiumcontent are ' \ + 'required OR let brightray choose it') parser.add_argument('--libcc_static_library_path', required=False, - help='The static library path of libchromiumcontent. NOTE: All options of libchromiumcontent are required OR let brightray choose it') + help='The static library path of libchromiumcontent. ' \ + 'NOTE: All options of libchromiumcontent are ' \ + 'required OR let brightray choose it') return parser.parse_args() @@ -68,7 +75,6 @@ def setup_libchromiumcontent(is_dev, commit, target_arch, url, libcc_source_path, libcc_shared_library_path, libcc_static_library_path): - mkdir_p(DOWNLOAD_DIR) target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent') download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script', 'download') @@ -76,9 +82,12 @@ def setup_libchromiumcontent(is_dev, commit, target_arch, url, if (libcc_source_path != None and libcc_shared_library_path != None and libcc_static_library_path != None): - args.append(['--libcc_source_path', libcc_source_path, - '--libcc_shared_library_path', libcc_shared_library_path, - '--libcc_static_library_path', libcc_static_library_path]) + args += ['--libcc_source_path', libcc_source_path, + '--libcc_shared_library_path', libcc_shared_library_path, + '--libcc_static_library_path', libcc_static_library_path] + mkdir_p(target_dir) + else: + mkdir_p(DOWNLOAD_DIR) if is_dev: subprocess.check_call([sys.executable, download] + args) else: