build: use different directory for generated breakpad symbols (#15716)

This commit is contained in:
John Kleinschmidt 2018-11-14 12:47:01 -08:00 committed by GitHub
parent 511dc9a80b
commit b53a858400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 8 deletions

View file

@ -353,7 +353,7 @@ step-generate-breakpad-symbols: &step-generate-breakpad-symbols
command: |
cd src
export BUILD_PATH="$PWD/out/Default"
export DEST_PATH="$BUILD_PATH/electron.breakpad.syms"
export DEST_PATH="$BUILD_PATH/breakpad_symbols"
electron/script/dump-symbols.py -b $BUILD_PATH -d $DEST_PATH -v
step-zip-symbols: &step-zip-symbols

View file

@ -70,7 +70,7 @@ build_script:
if ($env:GN_CONFIG -eq 'release') {
ninja -C out/Default third_party/breakpad:dump_syms
}
- if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\electron.breakpad.syms -v)
- if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\breakpad_symbols -v)
- ps: >-
if ($env:GN_CONFIG -eq 'release') {
python electron\script\zip-symbols.py

View file

@ -72,7 +72,7 @@ def generate_posix_symbols(binary, source_root, build_dir, destination):
'--binary={0}'.format(binary),
]
if is_verbose_mode():
args += ['-v']
args += ['--verbose']
execute([sys.executable, generate_breakpad_symbols] + args)
def parse_args():

View file

@ -14,9 +14,7 @@ RELEASE_DIR = get_out_dir()
PROJECT_NAME = get_electron_branding()['project_name']
PRODUCT_NAME = get_electron_branding()['product_name']
SYMBOLS_DIR = os.path.join(
RELEASE_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME)
)
SYMBOLS_DIR = os.path.join(RELEASE_DIR, 'breakpad_symbols')
PDB_LIST = [
os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME))

View file

@ -24,7 +24,7 @@ def main():
licenses = ['LICENSE', 'LICENSES.chromium.html', 'version']
with scoped_cwd(args.build_dir):
dirs = ['{0}.breakpad.syms'.format(PROJECT_NAME)]
dirs = ['breakpad_symbols']
print('Making symbol zip: ' + zip_file)
make_zip(zip_file, licenses, dirs)

View file

@ -110,7 +110,7 @@ jobs:
# TODO(alexeykuzmin): Explicitly pass an out folder path to the scripts.
export ELECTRON_OUT_DIR=Default
electron/script/dump-symbols.py -d "$PWD/out/Default/electron.breakpad.syms"
electron/script/dump-symbols.py -d "$PWD/out/Default/breakpad_symbols"
electron/script/zip-symbols.py
displayName: Collect symbols
condition: and(succeeded(), eq(variables['ELECTRON_RELEASE'], '1'))