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

Add --distrib-subdir-suffix option to make_distrib

Browse Source
This commit is contained in:
Marshall Greenblatt 2020-08-03 14:37:24 -04:00
parent b822ea43b9
commit 9717d3e1da
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -912,10 +912,17 @@ parser.add_option(
dest='cleanartifacts', dest='cleanartifacts',
default=False, default=False,
help='Clean the artifacts output directory.') help='Clean the artifacts output directory.')
parser.add_option('--distrib-subdir', dest='distribsubdir', parser.add_option(
help='CEF distrib dir name, child of '+\ '--distrib-subdir',
'chromium/src/cef/binary_distrib', dest='distribsubdir',
default='') help='CEF distrib dir name, child of chromium/src/cef/binary_distrib',
default='')
parser.add_option(
'--distrib-subdir-suffix',
dest='distribsubdirsuffix',
default='',
help='CEF distrib dir name suffix, child of chromium/src/cef/binary_distrib',
default='')
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
@ -1620,6 +1627,8 @@ if not options.nodistrib and (chromium_checkout_changed or \
# Override the subdirectory name of binary_distrib if the caller requested. # Override the subdirectory name of binary_distrib if the caller requested.
if options.distribsubdir != '': if options.distribsubdir != '':
path += ' --distrib-subdir=' + options.distribsubdir path += ' --distrib-subdir=' + options.distribsubdir
if options.distribsubdirsuffix != '':
path += ' --distrib-subdir-suffix=' + options.distribsubdirsuffix
# Create the distribution. # Create the distribution.
run(path, cef_tools_dir, depot_tools_dir) run(path, cef_tools_dir, depot_tools_dir)

7
tools/make_distrib.py
View File

@ -453,6 +453,11 @@ parser.add_option(
dest='distribsubdir', dest='distribsubdir',
help='name of the subdirectory for the distribution', help='name of the subdirectory for the distribution',
default='') default='')
parser.add_option(
'--distrib-subdir-suffix',
dest='distribsubdirsuffix',
help='suffix added to name of the subdirectory for the distribution',
default='')
parser.add_option( parser.add_option(
'--allow-partial', '--allow-partial',
action='store_true', action='store_true',
@ -628,6 +633,8 @@ output_dir_base = 'cef_binary_' + cef_ver
if options.distribsubdir == '': if options.distribsubdir == '':
output_dir_name = output_dir_base + '_' + platform + platform_arch output_dir_name = output_dir_base + '_' + platform + platform_arch
if options.distribsubdirsuffix != '':
output_dir_name += '_' + options.distribsubdirsuffix
else: else:
output_dir_name = options.distribsubdir output_dir_name = options.distribsubdir