Update upload symbols script for posix

script/upload-windows-pdb.py → script/upload-symbols.py

@@ -4,34 +4,39 @@ import os
 import glob
 import sys
 
-from lib.config import s3_config
+from lib.config import PLATFORM, s3_config, enable_verbose_mode
 from lib.util import electron_gyp, execute, rm_rf, safe_mkdir, s3put
 
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-SYMBOLS_DIR = 'dist\\symbols'
-DOWNLOAD_DIR = 'vendor\\download\\libchromiumcontent'
+DIST_DIR = os.path.join(SOURCE_ROOT, 'dist')
+RELEASE_DIR = os.path.join(SOURCE_ROOT, 'out', 'R')
 
 PROJECT_NAME = electron_gyp()['project_name%']
 PRODUCT_NAME = electron_gyp()['product_name%']
 
+if PLATFORM == 'win32':
+  SYMBOLS_DIR = os.path.join(DIST_DIR, 'symbols')
+else:
+  SYMBOLS_DIR = os.path.join(DIST_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME))
+
 PDB_LIST = [
-  'out\\R\\{0}.exe.pdb'.format(PROJECT_NAME),
-  'out\\R\\node.dll.pdb',
+  os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME)),
+  os.path.join(RELEASE_DIR, 'node.dll.pdb')
 ]
 
 
 def main():
   os.chdir(SOURCE_ROOT)
-
-  rm_rf(SYMBOLS_DIR)
-  safe_mkdir(SYMBOLS_DIR)
-  for pdb in PDB_LIST:
-    run_symstore(pdb, SYMBOLS_DIR, PRODUCT_NAME)
+  if PLATFORM == 'win32':
+    for pdb in PDB_LIST:
+      run_symstore(pdb, SYMBOLS_DIR, PRODUCT_NAME)
+    files = glob.glob(SYMBOLS_DIR + '/*.pdb/*/*.pdb')
+    files = [f.lower() for f in files]
+  else:
+    files = glob.glob(SYMBOLS_DIR + '/*/*/*.sym')
 
   bucket, access_key, secret_key = s3_config()
-  files = glob.glob(SYMBOLS_DIR + '/*.pdb/*/*.pdb')
-  files = [f.lower() for f in files]
   upload_symbols(bucket, access_key, secret_key, files)
 
 

script/upload.py

@@ -103,13 +103,13 @@ def main():
     upload_electron(github, release, os.path.join(DIST_DIR, mksnapshot),
                     args)
 
-  if PLATFORM == 'win32' and not tag_exists and not args.upload_to_s3:
-    # Upload PDBs to Windows symbol server.
-    run_python_script('upload-windows-pdb.py')
-
-    # Upload node headers.
-    run_python_script('create-node-headers.py', '-v', args.version)
-    run_python_script('upload-node-headers.py', '-v', args.version)
+  if not tag_exists and not args.upload_to_s3:
+    # Upload symbols to symbol server.
+    run_python_script('upload-symbols.py')
+    if PLATFORM == 'win32':
+      # Upload node headers.
+      run_python_script('create-node-headers.py', '-v', args.version)
+      run_python_script('upload-node-headers.py', '-v', args.version)
 
 
 def parse_args():