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

Merge pull request #174 from tejaspathak/master

Browse source 
Fix build error
This commit is contained in:
Cheng Zhao 2015-11-12 09:48:20 +08:00
commit cdc27a85c0
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
brightray/script/bootstrap
View file

@ -29,7 +29,8 @@ def main():
elif (args.libcc_source_path != None or elif (args.libcc_source_path != None or
args.libcc_shared_library_path != None or args.libcc_shared_library_path != None or
args.libcc_static_library_path != None): 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) sys.exit(0)
update_submodules() update_submodules()
setup_libchromiumcontent(args.dev, args.commit, args.target_arch, args.url, 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 (i.e., the URL you passed to '
'libchromiumcontent\'s script/upload script') 'libchromiumcontent\'s script/upload script')
parser.add_argument('--libcc_source_path', required=False, 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, 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, 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() return parser.parse_args()
@ -68,7 +75,6 @@ def setup_libchromiumcontent(is_dev, commit, target_arch, url,
libcc_source_path, libcc_source_path,
libcc_shared_library_path, libcc_shared_library_path,
libcc_static_library_path): libcc_static_library_path):
mkdir_p(DOWNLOAD_DIR)
target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent') target_dir = os.path.join(DOWNLOAD_DIR, 'libchromiumcontent')
download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script', download = os.path.join(VENDOR_DIR, 'libchromiumcontent', 'script',
'download') 'download')
@ -76,9 +82,12 @@ def setup_libchromiumcontent(is_dev, commit, target_arch, url,
if (libcc_source_path != None and if (libcc_source_path != None and
libcc_shared_library_path != None and libcc_shared_library_path != None and
libcc_static_library_path != None): libcc_static_library_path != None):
args.append(['--libcc_source_path', libcc_source_path, args += ['--libcc_source_path', libcc_source_path,
'--libcc_shared_library_path', libcc_shared_library_path, '--libcc_shared_library_path', libcc_shared_library_path,
'--libcc_static_library_path', libcc_static_library_path]) '--libcc_static_library_path', libcc_static_library_path]
mkdir_p(target_dir)
else:
mkdir_p(DOWNLOAD_DIR)
if is_dev: if is_dev:
subprocess.check_call([sys.executable, download] + args) subprocess.check_call([sys.executable, download] + args)
else: else: