diff --git a/.circleci/config.yml b/.circleci/config.yml index f09dee131c2ea..7b6fa61ea4eb0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/appveyor.yml b/appveyor.yml index 647e38ee94887..aa458bd76fa5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/script/dump-symbols.py b/script/dump-symbols.py index 36286edf7018d..cb9f4cefeb931 100755 --- a/script/dump-symbols.py +++ b/script/dump-symbols.py @@ -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(): diff --git a/script/upload-symbols.py b/script/upload-symbols.py index 156ff415bd72c..3e4e7e7b700cd 100755 --- a/script/upload-symbols.py +++ b/script/upload-symbols.py @@ -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)) diff --git a/script/zip-symbols.py b/script/zip-symbols.py index 745ef5aa2b114..411739514ea9b 100755 --- a/script/zip-symbols.py +++ b/script/zip-symbols.py @@ -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) diff --git a/vsts.yml b/vsts.yml index 4fddc0920f05f..303706d4fd7b9 100644 --- a/vsts.yml +++ b/vsts.yml @@ -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'))