diff --git a/script/dump-symbols.py b/script/dump-symbols.py index e8df27fdd2b0..9ac6782943b7 100755 --- a/script/dump-symbols.py +++ b/script/dump-symbols.py @@ -15,6 +15,8 @@ CHROMIUM_DIR = os.path.join(SOURCE_ROOT, 'vendor', 'brightray', 'vendor', def main(destination): + register_required_dll() + rm_rf(destination) (project_name, product_name) = get_names_from_gyp() @@ -44,13 +46,18 @@ def main(destination): args = [ '--symbols-dir={0}'.format(destination), '--jobs=16', - OUT_DIR, - CHROMIUM_DIR, + os.path.relpath(OUT_DIR), ] execute([sys.executable, generate_breakpad_symbols] + args) +def register_required_dll(): + register = os.path.join(SOURCE_ROOT, 'tools', 'win', + 'register_msdia80_dll.js') + execute(['node.exe', os.path.relpath(register)]); + + def get_names_from_gyp(): gyp = os.path.join(SOURCE_ROOT, 'atom.gyp') with open(gyp) as f: diff --git a/tools/win/generate_breakpad_symbols.py b/tools/win/generate_breakpad_symbols.py old mode 100644 new mode 100755 index f69c30c712a1..a294d8c5e583 --- a/tools/win/generate_breakpad_symbols.py +++ b/tools/win/generate_breakpad_symbols.py @@ -47,11 +47,6 @@ def mkdir_p(path): else: raise -def RegisterRequiredDll(): - register = os.path.join(os.path.dirname(__file__), 'register_msdia80_dll.js') - subprocess.check_call(['node.exe', register]); - - def GenerateSymbols(options, binaries): """Dumps the symbols of binary and places them in the given directory.""" @@ -124,7 +119,6 @@ def main(): pdbs += glob.glob(os.path.join(directory, '*.exe.pdb')) pdbs += glob.glob(os.path.join(directory, '*.dll.pdb')) - RegisterRequiredDll(); GenerateSymbols(options, pdbs) return 0