ci: fix windows symbol gen
This commit is contained in:
parent
78239ff0ad
commit
fda4112168
2 changed files with 21 additions and 11 deletions
|
@ -38,7 +38,10 @@ build_script:
|
||||||
- ps: >-
|
- ps: >-
|
||||||
if ($env:GN_CONFIG -eq 'release') {
|
if ($env:GN_CONFIG -eq 'release') {
|
||||||
ninja -C out/Default third_party/breakpad:dump_syms
|
ninja -C out/Default third_party/breakpad:dump_syms
|
||||||
python electron\script\dump-symbols.py -d %cd%/out/Default/electron.breakpad.syms
|
}
|
||||||
|
- if "%GN_CONFIG%"=="release" ( python electron\script\dump-symbols.py -d %cd%\out\Default\electron.breakpad.syms -v)
|
||||||
|
- ps: >-
|
||||||
|
if ($env:GN_CONFIG -eq 'release') {
|
||||||
python electron\script\zip-symbols.py
|
python electron\script\zip-symbols.py
|
||||||
appveyor PushArtifact out/Default/electron.breakpad.syms
|
appveyor PushArtifact out/Default/electron.breakpad.syms
|
||||||
}
|
}
|
||||||
|
@ -66,4 +69,4 @@ deploy_script:
|
||||||
Write-Output "Uploading Electron release distribution to github releases"
|
Write-Output "Uploading Electron release distribution to github releases"
|
||||||
& python script\upload.py
|
& python script\upload.py
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,8 @@ import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from lib.config import PLATFORM, enable_verbose_mode, is_verbose_mode
|
from lib.config import PLATFORM, enable_verbose_mode, is_verbose_mode
|
||||||
from lib.util import get_electron_branding, execute, rm_rf, get_out_dir
|
from lib.util import get_electron_branding, execute, rm_rf, get_out_dir, \
|
||||||
|
GN_SRC_DIR
|
||||||
|
|
||||||
ELECTRON_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
ELECTRON_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
|
||||||
SOURCE_ROOT = os.path.abspath(os.path.dirname(ELECTRON_ROOT))
|
SOURCE_ROOT = os.path.abspath(os.path.dirname(ELECTRON_ROOT))
|
||||||
|
@ -30,12 +31,12 @@ def main():
|
||||||
helper_app = os.path.join(build_path, '{0}.app'.format(helper_name),
|
helper_app = os.path.join(build_path, '{0}.app'.format(helper_name),
|
||||||
'Contents', 'MacOS', product_name + " Helper")
|
'Contents', 'MacOS', product_name + " Helper")
|
||||||
binaries = [main_app, helper_app]
|
binaries = [main_app, helper_app]
|
||||||
for binary in binaries:
|
for binary in binaries:
|
||||||
generate_posix_symbols(binary, source_root, build_path,
|
generate_posix_symbols(binary, source_root, build_path,
|
||||||
args.destination)
|
args.destination)
|
||||||
else:
|
else:
|
||||||
binary = os.path.join(build_path, project_name)
|
binary = os.path.join(build_path, project_name)
|
||||||
generate_posix_symbols(binary, source_root, build_path,
|
generate_posix_symbols(binary, source_root, build_path,
|
||||||
args.destination)
|
args.destination)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
@ -45,8 +46,14 @@ def main():
|
||||||
'--symbols-dir={0}'.format(args.destination),
|
'--symbols-dir={0}'.format(args.destination),
|
||||||
'--jobs=16',
|
'--jobs=16',
|
||||||
os.path.relpath(build_path),
|
os.path.relpath(build_path),
|
||||||
]
|
]
|
||||||
execute([sys.executable, generate_breakpad_symbols] + args)
|
#Make sure msdia140.dll is in the path (needed for dump_syms.exe)
|
||||||
|
env = os.environ.copy()
|
||||||
|
msdia140_dll_path = os.path.join(GN_SRC_DIR, 'third_party', 'llvm-build',
|
||||||
|
'Release+Asserts', 'bin')
|
||||||
|
env['PATH'] = os.path.pathsep.join(
|
||||||
|
[env.get('PATH', '')] + [msdia140_dll_path])
|
||||||
|
execute([sys.executable, generate_breakpad_symbols] + args, env)
|
||||||
|
|
||||||
def get_names_from_branding():
|
def get_names_from_branding():
|
||||||
variables = get_electron_branding()
|
variables = get_electron_branding()
|
||||||
|
@ -62,9 +69,9 @@ def generate_posix_symbols(binary, source_root, build_dir, destination):
|
||||||
'--jobs=16',
|
'--jobs=16',
|
||||||
'--binary={0}'.format(binary),
|
'--binary={0}'.format(binary),
|
||||||
]
|
]
|
||||||
if is_verbose_mode():
|
if is_verbose_mode():
|
||||||
args += ['-v']
|
args += ['-v']
|
||||||
execute([sys.executable, generate_breakpad_symbols] + args)
|
execute([sys.executable, generate_breakpad_symbols] + args)
|
||||||
|
|
||||||
def parse_args():
|
def parse_args():
|
||||||
parser = argparse.ArgumentParser(description='Create breakpad symbols')
|
parser = argparse.ArgumentParser(description='Create breakpad symbols')
|
||||||
|
@ -83,7 +90,7 @@ def parse_args():
|
||||||
required=False)
|
required=False)
|
||||||
parser.add_argument('-v', '--verbose',
|
parser.add_argument('-v', '--verbose',
|
||||||
action='store_true',
|
action='store_true',
|
||||||
help='Prints the output of the subprocesses')
|
help='Prints the output of the subprocesses')
|
||||||
return parser.parse_args()
|
return parser.parse_args()
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Loading…
Reference in a new issue