Mac: Fix dSYM processing and add debug dSYM in make_distrib.py (issue #1403)
This commit is contained in:
parent
cb3e183d78
commit
3e763188b5
|
@ -49,12 +49,9 @@ def create_fake_files(platform, version):
|
|||
files.append(make_fake_file_info(platform, version, 'minimal'))
|
||||
files.append(make_fake_file_info(platform, version, 'client'))
|
||||
|
||||
# Windows platforms create debug symbols.
|
||||
if platform.find('windows') == 0:
|
||||
files.append(make_fake_file_info(platform, version, 'debug_symbols'))
|
||||
|
||||
# Windows and OS X platforms create release symbols.
|
||||
# Windows and OS X platforms create debug and release symbols.
|
||||
if platform.find('windows') == 0 or platform.find('macosx') == 0:
|
||||
files.append(make_fake_file_info(platform, version, 'debug_symbols'))
|
||||
files.append(make_fake_file_info(platform, version, 'release_symbols'))
|
||||
|
||||
return files
|
||||
|
|
|
@ -651,6 +651,16 @@ elif platform == 'macosx':
|
|||
copy_dir(os.path.join(build_dir, 'cefclient.app/Contents/Frameworks/%s.framework' % framework_name), \
|
||||
os.path.join(dst_dir, '%s.framework' % framework_name), options.quiet)
|
||||
|
||||
if not options.nosymbols and use_gn:
|
||||
# create the symbol output directory
|
||||
symbol_output_dir = create_output_dir(output_dir_name + '_debug_symbols', options.outputdir)
|
||||
|
||||
# The real dSYM already exists, just copy it to the output directory.
|
||||
# dSYMs are only generated when is_official_build=true or enable_dsyms=true.
|
||||
# See //build/config/mac/symbols.gni.
|
||||
copy_dir(os.path.join(build_dir, '%s.dSYM' % framework_name),
|
||||
os.path.join(symbol_output_dir, '%s.dSYM' % framework_name), options.quiet)
|
||||
|
||||
# transfer Release files
|
||||
build_dir = build_dir_release
|
||||
if not options.allowpartial or path_exists(os.path.join(build_dir, 'cefclient.app')):
|
||||
|
@ -667,12 +677,15 @@ elif platform == 'macosx':
|
|||
# create the symbol output directory
|
||||
symbol_output_dir = create_output_dir(output_dir_name + '_release_symbols', options.outputdir)
|
||||
|
||||
if use_gn:
|
||||
# The real dSYM already exists, just copy it to the output directory.
|
||||
# dSYMs are only generated when is_official_build=true or enable_dsyms=true.
|
||||
# See //build/config/mac/symbols.gni.
|
||||
copy_dir(os.path.join(build_dir, '%s.dSYM' % framework_name),
|
||||
os.path.join(symbol_output_dir, '%s.dSYM' % framework_name), options.quiet)
|
||||
else:
|
||||
# create the real dSYM file from the "fake" dSYM file
|
||||
sys.stdout.write("Creating the real dSYM file...\n")
|
||||
if use_gn:
|
||||
src_path = os.path.join(build_dir, \
|
||||
'%s.dSYM/Contents/Resources/DWARF/%s' % (framework_name, framework_name))
|
||||
else:
|
||||
src_path = os.path.join(build_dir, \
|
||||
'%s.framework.dSYM/Contents/Resources/DWARF/%s' % (framework_name, framework_name))
|
||||
dst_path = os.path.join(symbol_output_dir, '%s.dSYM' % framework_name)
|
||||
|
|
Loading…
Reference in New Issue