bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build with GN by default (issue #1403)

This commit is contained in:
Marshall Greenblatt 2016-07-20 18:27:37 -04:00
parent f2f76a0a20
commit d92bc1d200
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/automate/automate-git.py
View File

@ -517,7 +517,14 @@ branch_is_2357_or_newer = (cef_branch == 'trunk' or int(cef_branch) >= 2357)
# True if the requested branch is 2743 or older. # True if the requested branch is 2743 or older.
branch_is_2743_or_older = (cef_branch != 'trunk' and int(cef_branch) <= 2743) branch_is_2743_or_older = (cef_branch != 'trunk' and int(cef_branch) <= 2743)
# Whether to use GN or GYP. GYP is currently the default. # True if the requested branch is newer than 2785.
branch_is_newer_than_2785 = (cef_branch == 'trunk' or int(cef_branch) > 2785)
# Enable GN by default for branches newer than 2785.
if branch_is_newer_than_2785 and not 'CEF_USE_GN' in os.environ.keys():
os.environ['CEF_USE_GN'] = '1'
# Whether to use GN or GYP. GYP is currently the default for older branches.
use_gn = bool(int(os.environ.get('CEF_USE_GN', '0'))) use_gn = bool(int(os.environ.get('CEF_USE_GN', '0')))
if use_gn: if use_gn:
if branch_is_2743_or_older: if branch_is_2743_or_older:

4
tools/gclient_hook.py
View File

@ -40,8 +40,8 @@ RunAction(cef_dir, patcher)
print "\nGenerating CEF project files..." print "\nGenerating CEF project files..."
# Whether to use GN or GYP. GYP is currently the default. # Whether to use GN or GYP. GN is currently the default.
use_gn = bool(int(os.environ.get('CEF_USE_GN', '0'))) use_gn = bool(int(os.environ.get('CEF_USE_GN', '1')))
gn_args = {} gn_args = {}
custom_toolchain = False custom_toolchain = False

4
tools/make_distrib.py
View File

@ -282,8 +282,8 @@ elif sys.platform == 'darwin':
elif sys.platform.startswith('linux'): elif sys.platform.startswith('linux'):
platform = 'linux' platform = 'linux'
# Whether to use GN or GYP. GYP is currently the default. # Whether to use GN or GYP. GN is currently the default.
use_gn = bool(int(os.environ.get('CEF_USE_GN', '0'))) use_gn = bool(int(os.environ.get('CEF_USE_GN', '1')))
# the outputdir option is required # the outputdir option is required
if options.outputdir is None: if options.outputdir is None: