diff --git a/tools/automate/automate-git.py b/tools/automate/automate-git.py index b33e4a580..9c372d37d 100644 --- a/tools/automate/automate-git.py +++ b/tools/automate/automate-git.py @@ -912,10 +912,17 @@ parser.add_option( dest='cleanartifacts', default=False, help='Clean the artifacts output directory.') -parser.add_option('--distrib-subdir', dest='distribsubdir', - help='CEF distrib dir name, child of '+\ - 'chromium/src/cef/binary_distrib', - default='') +parser.add_option( + '--distrib-subdir', + dest='distribsubdir', + 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() @@ -1620,6 +1627,8 @@ if not options.nodistrib and (chromium_checkout_changed or \ # Override the subdirectory name of binary_distrib if the caller requested. if options.distribsubdir != '': path += ' --distrib-subdir=' + options.distribsubdir + if options.distribsubdirsuffix != '': + path += ' --distrib-subdir-suffix=' + options.distribsubdirsuffix # Create the distribution. run(path, cef_tools_dir, depot_tools_dir) diff --git a/tools/make_distrib.py b/tools/make_distrib.py index 80ab514c0..a034ad1ec 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -453,6 +453,11 @@ parser.add_option( dest='distribsubdir', help='name of the subdirectory for the distribution', default='') +parser.add_option( + '--distrib-subdir-suffix', + dest='distribsubdirsuffix', + help='suffix added to name of the subdirectory for the distribution', + default='') parser.add_option( '--allow-partial', action='store_true', @@ -628,6 +633,8 @@ output_dir_base = 'cef_binary_' + cef_ver if options.distribsubdir == '': output_dir_name = output_dir_base + '_' + platform + platform_arch + if options.distribsubdirsuffix != '': + output_dir_name += '_' + options.distribsubdirsuffix else: output_dir_name = options.distribsubdir