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

Update libchromiumcontent for filenames.gypi fix

Browse source
This commit is contained in:
Cheng Zhao 2015-11-09 18:19:32 +08:00
parent 93ebbb1c86
commit 7720346ee7
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
brightray/script/bootstrap
View file

@ -68,21 +68,22 @@ 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) 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')
args = ['-f', '-c', commit, '--target_arch', target_arch, url, target_dir] args = ['-f', '-c', commit, '--target_arch', target_arch, url, target_dir]
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.append(['--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])
if is_dev: if is_dev:
subprocess.check_call([sys.executable, download] + args) subprocess.check_call([sys.executable, download] + args)
else: else:
subprocess.check_call([sys.executable, download, '-s'] + args) subprocess.check_call([sys.executable, download, '-s'] + args)
def mkdir_p(path): def mkdir_p(path):
try: try:

2
brightray/vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 2bf9a031b05c9f8b08e4370f87f9d06cd1676cad Subproject commit f202592f932cfb8494cc6fa211f9b917f2457f3b