mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Also search libchromiumcontent download dir for dSYMs.

Browse source
This commit is contained in:
Cheng Zhao 2013-11-23 01:07:38 -08:00
parent 6393e2e1e5
commit deef68bcf9
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom.gyp
View file

@ -422,6 +422,7 @@
'--build-dir=<(PRODUCT_DIR)', '--build-dir=<(PRODUCT_DIR)',
'--binary=<(PRODUCT_DIR)/<(product_name).app/Contents/MacOS/<(product_name)', '--binary=<(PRODUCT_DIR)/<(product_name).app/Contents/MacOS/<(product_name)',
'--symbols-dir=<(PRODUCT_DIR)/Atom-Shell.breakpad.syms', '--symbols-dir=<(PRODUCT_DIR)/Atom-Shell.breakpad.syms',
'--libchromiumcontent-dir=<(libchromiumcontent_library_dir)',
'--clear', '--clear',
'--jobs=16', '--jobs=16',
], ],

5
script/create-dist.py
View file

@ -164,11 +164,6 @@ def download_libchromiumcontent_symbols(url):
'download') 'download')
subprocess.check_call([sys.executable, download, '-f', '-s', url, target_dir]) subprocess.check_call([sys.executable, download, '-f', '-s', url, target_dir])
if sys.platform == 'darwin':
shutil.copytree(symbols_path,
os.path.join(OUT_DIR, symbols_name),
symlinks=True)
def create_symbols(): def create_symbols():
build = os.path.join(SOURCE_ROOT, 'script', 'build.py') build = os.path.join(SOURCE_ROOT, 'script', 'build.py')

19
tools/mac/generate_breakpad_symbols.py
View file

@ -59,18 +59,19 @@ def FindBundlePart(full_path):
return '' return ''
def GetDSYMBundle(build_dir, binary_path): def GetDSYMBundle(options, binary_path):
"""Finds the .dSYM bundle to the binary.""" """Finds the .dSYM bundle to the binary."""
if binary_path[0] == '/' or binary_path == '': if binary_path[0] == '/' or binary_path == '':
return binary_path return binary_path
filename = FindBundlePart(binary_path) filename = FindBundlePart(binary_path)
search_dirs = [options.build_dir, options.libchromiumcontent_dir]
if filename.endswith(('.dylib', '.framework', '.app')): if filename.endswith(('.dylib', '.framework', '.app')):
dsym_path = os.path.join(build_dir, filename) + '.dSYM' for directory in search_dirs:
dsym_path = os.path.join(directory, filename) + '.dSYM'
if dsym_path != None and os.path.exists(dsym_path): if os.path.exists(dsym_path):
return dsym_path return dsym_path
else:
return binary_path return binary_path
@ -176,7 +177,7 @@ def GenerateSymbols(options, binaries):
print "Generating symbols for %s" % binary print "Generating symbols for %s" % binary
if sys.platform == 'darwin': if sys.platform == 'darwin':
binary = GetDSYMBundle(options.build_dir, binary) binary = GetDSYMBundle(options, binary)
syms = GetCommandOutput([GetDumpSymsBinary(options.build_dir), '-r', '-c', syms = GetCommandOutput([GetDumpSymsBinary(options.build_dir), '-r', '-c',
binary]) binary])
@ -208,6 +209,8 @@ def main():
help='The build output directory.') help='The build output directory.')
parser.add_option('', '--symbols-dir', default='', parser.add_option('', '--symbols-dir', default='',
help='The directory where to write the symbols file.') help='The directory where to write the symbols file.')
parser.add_option('', '--libchromiumcontent-dir', default='',
help='The directory where libchromiumcontent is downloaded.')
parser.add_option('', '--binary', default='', parser.add_option('', '--binary', default='',
help='The path of the binary to generate symbols for.') help='The path of the binary to generate symbols for.')
parser.add_option('', '--clear', default=False, action='store_true', parser.add_option('', '--clear', default=False, action='store_true',
@ -228,6 +231,10 @@ def main():
print "Required option --build-dir missing." print "Required option --build-dir missing."
return 1 return 1
if not options.libchromiumcontent_dir:
print "Required option --libchromiumcontent-dir missing."
return 1
if not options.binary: if not options.binary:
print "Required option --binary missing." print "Required option --binary missing."
return 1 return 1