Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: use different directory for generated breakpad symbols #15716

Merged
merged 1 commit into from
Nov 14, 2018
Merged

build: use different directory for generated breakpad symbols #15716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion script/dump-symbols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
4 changes: 1 addition & 3 deletions script/upload-symbols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@

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))
Expand Down
2 changes: 1 addition & 1 deletion script/zip-symbols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion vsts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down