bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-16 20:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update make_distrib.py to require ninja build on all platforms.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1936 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-11-25 23:32:34 +00:00
parent 2dfaf00ce4
commit 3556777a5f
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/make_distrib.py
View File

@ -245,8 +245,8 @@ if options.minimal and options.client:
parser.print_help(sys.stderr) parser.print_help(sys.stderr)
sys.exit() sys.exit()
if platform == 'windows' and options.x64build and not options.ninjabuild: if not options.ninjabuild:
print 'x64 build on Windows requires ninja' print 'Ninja build is required on all platforms'
sys.exit() sys.exit()
# script directory # script directory
@ -299,9 +299,7 @@ if options.x64build:
if platform == 'linux': if platform == 'linux':
platform_arch = '' platform_arch = ''
lib_dir_name = 'lib.target' lib_dir_name = 'lib'
if options.ninjabuild:
lib_dir_name = 'lib'
release_libcef_path = os.path.join(src_dir, 'out', 'Release', lib_dir_name, 'libcef.so'); release_libcef_path = os.path.join(src_dir, 'out', 'Release', lib_dir_name, 'libcef.so');
debug_libcef_path = os.path.join(src_dir, 'out', 'Debug', lib_dir_name, 'libcef.so'); debug_libcef_path = os.path.join(src_dir, 'out', 'Debug', lib_dir_name, 'libcef.so');
file_desc = '' file_desc = ''
@ -430,26 +428,15 @@ if platform == 'windows':
if not options.x64build: if not options.x64build:
binaries.append('wow_helper.exe') binaries.append('wow_helper.exe')
if options.ninjabuild: out_dir = os.path.join(src_dir, 'out')
out_dir = os.path.join(src_dir, 'out') libcef_dll_file = 'libcef.dll.lib'
libcef_dll_file = 'libcef.dll.lib' sandbox_libs = [
sandbox_libs = [ 'obj\\base\\base.lib',
'obj\\base\\base.lib', 'obj\\base\\base_static.lib',
'obj\\base\\base_static.lib', 'obj\\cef\\cef_sandbox.lib',
'obj\\cef\\cef_sandbox.lib', 'obj\\base\\third_party\\dynamic_annotations\\dynamic_annotations.lib',
'obj\\base\\third_party\\dynamic_annotations\\dynamic_annotations.lib', 'obj\\sandbox\\sandbox.lib',
'obj\\sandbox\\sandbox.lib', ]
]
else:
out_dir = os.path.join(src_dir, 'build')
libcef_dll_file = 'lib/libcef.lib'
sandbox_libs = [
'lib\\base.lib',
'lib\\base_static.lib',
'lib\\cef_sandbox.lib',
'lib\\dynamic_annotations.lib',
'lib\\sandbox.lib',
]
valid_build_dir = None valid_build_dir = None
@ -548,10 +535,7 @@ if platform == 'windows':
copy_dir(src_dir, docs_output_dir, options.quiet) copy_dir(src_dir, docs_output_dir, options.quiet)
elif platform == 'macosx': elif platform == 'macosx':
if options.ninjabuild: out_dir = os.path.join(src_dir, 'out')
out_dir = os.path.join(src_dir, 'out')
else:
out_dir = os.path.join(src_dir, 'xcodebuild')
valid_build_dir = None valid_build_dir = None
framework_name = 'Chromium Embedded Framework' framework_name = 'Chromium Embedded Framework'
@ -624,10 +608,7 @@ elif platform == 'macosx':
elif platform == 'linux': elif platform == 'linux':
out_dir = os.path.join(src_dir, 'out') out_dir = os.path.join(src_dir, 'out')
if options.ninjabuild: lib_dir_name = 'lib'
lib_dir_name = 'lib'
else:
lib_dir_name = 'lib.target'
valid_build_dir = None valid_build_dir = None