Browse Source

chore: fix upload.py for symbol.zip upload

Samuel Attard 6 years ago
parent
commit
851cd22f10
2 changed files with 7 additions and 8 deletions
  1. 3 6
      script/upload-symbols.py
  2. 4 2
      script/upload.py

+ 3 - 6
script/upload-symbols.py

@@ -10,16 +10,13 @@ from lib.util import get_electron_branding, execute, rm_rf, safe_mkdir, s3put, \
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 RELEASE_DIR = get_out_dir()
-GEN_DIR = os.path.join(RELEASE_DIR, 'gen')
 
 
 PROJECT_NAME = get_electron_branding()['project_name']
 PRODUCT_NAME = get_electron_branding()['product_name']
-
-if PLATFORM == 'win32':
-  SYMBOLS_DIR = os.path.join(GEN_DIR, 'symbols')
-else:
-  SYMBOLS_DIR = os.path.join(GEN_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME))
+SYMBOLS_DIR = os.path.join(
+  RELEASE_DIR, '{0}.breakpad.syms'.format(PROJECT_NAME)
+)
 
 PDB_LIST = [
   os.path.join(RELEASE_DIR, '{0}.exe.pdb'.format(PROJECT_NAME))

+ 4 - 2
script/upload.py

@@ -65,7 +65,7 @@ def main():
   upload_electron(release, electron_zip, args)
   if get_target_arch() != 'mips64el':
     symbols_zip = os.path.join(OUT_DIR, SYMBOLS_NAME)
-    shutil.copy2(os.path.join(OUT_DIR, 'symobls.zip'), symbols_zip)
+    shutil.copy2(os.path.join(OUT_DIR, 'symbols.zip'), symbols_zip)
     upload_electron(release, symbols_zip, args)
   if PLATFORM == 'darwin':
     api_path = os.path.join(OUT_DIR, 'electron-api.json')
@@ -77,7 +77,9 @@ def main():
     shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
     upload_electron(release, dsym_zip, args)
   elif PLATFORM == 'win32':
-    upload_electron(release, os.path.join(OUT_DIR, PDB_NAME), args)
+    pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
+    upload_electron(release, pdb_zip, args)
 
   # Upload free version of ffmpeg.
   ffmpeg = get_zip_name('ffmpeg', ELECTRON_VERSION)