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

Don't include locales/*.info files in distribution (issue #2375)

This commit is contained in:
Marshall Greenblatt 2018-03-28 18:20:10 -04:00
parent ff8aa46e5e
commit a1f47abaf6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/make_distrib.py
View File

@ -274,6 +274,7 @@ def transfer_files(cef_dir, script_dir, transfer_cfg_dir, mode, output_dir,
# conditional [optional] Set to True if the path is conditional on build # conditional [optional] Set to True if the path is conditional on build
# settings. Missing conditional paths will not be # settings. Missing conditional paths will not be
# treated as an error. # treated as an error.
# delete [optional] Glob pattern of files to delete after the copy.
def copy_files_list(build_dir, dst_dir, paths): def copy_files_list(build_dir, dst_dir, paths):
''' Copy the files listed in |paths| from |build_dir| to |dst_dir|. ''' ''' Copy the files listed in |paths| from |build_dir| to |dst_dir|. '''
for entry in paths: for entry in paths:
@ -284,6 +285,13 @@ def copy_files_list(build_dir, dst_dir, paths):
make_dir(os.path.dirname(target_path), options.quiet) make_dir(os.path.dirname(target_path), options.quiet)
if os.path.isdir(source_path): if os.path.isdir(source_path):
copy_dir(source_path, target_path, options.quiet) copy_dir(source_path, target_path, options.quiet)
if 'delete' in entry:
for delete_path in get_files(
os.path.join(target_path, entry['delete'])):
if not os.path.isdir(delete_path):
remove_file(delete_path, options.quiet)
else:
raise Exception('Refusing to delete directory: %s' % delete_path)
else: else:
copy_file(source_path, target_path, options.quiet) copy_file(source_path, target_path, options.quiet)
else: else:
@ -714,7 +722,7 @@ if platform == 'windows':
{'path': 'cef_extensions.pak'}, {'path': 'cef_extensions.pak'},
{'path': 'devtools_resources.pak'}, {'path': 'devtools_resources.pak'},
{'path': 'icudtl.dat'}, {'path': 'icudtl.dat'},
{'path': 'locales'}, {'path': 'locales', 'delete': '*.info'},
] ]
# yapf: enable # yapf: enable
@ -981,7 +989,7 @@ elif platform == 'linux':
{'path': 'cef_extensions.pak'}, {'path': 'cef_extensions.pak'},
{'path': 'devtools_resources.pak'}, {'path': 'devtools_resources.pak'},
{'path': 'icudtl.dat'}, {'path': 'icudtl.dat'},
{'path': 'locales'}, {'path': 'locales', 'delete': '*.info'},
] ]
# yapf: enable # yapf: enable