From 3d9b9b97cfcfe34411e359d504e9b8a772622d56 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@electronjs.org>
Date: Mon, 7 Mar 2022 15:47:58 -0800
Subject: [PATCH] build: put v8_context_snapshot_generator.dSYM in its own zip
 file (#33183)

---
 script/release/release.js          | 4 ++++
 script/release/uploaders/upload.py | 7 ++++++-
 script/zip-symbols.py              | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/script/release/release.js b/script/release/release.js
index e10311e4fa..3527f39ce2 100755
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -107,9 +107,11 @@ function assetsForVersion (version, validatingRelease) {
     `chromedriver-${version}-win32-x64.zip`,
     `chromedriver-${version}-win32-arm64.zip`,
     `electron-${version}-darwin-x64-dsym.zip`,
+    `electron-${version}-darwin-x64-dsym-snapshot.zip`,
     `electron-${version}-darwin-x64-symbols.zip`,
     `electron-${version}-darwin-x64.zip`,
     `electron-${version}-darwin-arm64-dsym.zip`,
+    `electron-${version}-darwin-arm64-dsym-snapshot.zip`,
     `electron-${version}-darwin-arm64-symbols.zip`,
     `electron-${version}-darwin-arm64.zip`,
     `electron-${version}-linux-arm64-symbols.zip`,
@@ -122,9 +124,11 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-linux-x64-symbols.zip`,
     `electron-${version}-linux-x64.zip`,
     `electron-${version}-mas-x64-dsym.zip`,
+    `electron-${version}-mas-x64-dsym-snapshot.zip`,
     `electron-${version}-mas-x64-symbols.zip`,
     `electron-${version}-mas-x64.zip`,
     `electron-${version}-mas-arm64-dsym.zip`,
+    `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
     `electron-${version}-win32-ia32-pdb.zip`,
diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py
index b021f91dad..8b86a1d488 100755
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -33,6 +33,8 @@ OUT_DIR = get_out_dir()
 DIST_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
 SYMBOLS_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
 DSYM_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
+DSYM_SNAPSHOT_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
+                                  'dsym-snapshot')
 PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
 DEBUG_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'debug')
 TOOLCHAIN_PROFILE_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
@@ -88,6 +90,10 @@ def main():
     dsym_zip = os.path.join(OUT_DIR, DSYM_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
     upload_electron(release, dsym_zip, args)
+
+    dsym_snaphot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
+    upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
     pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
@@ -154,7 +160,6 @@ def main():
         'toolchain_profile.json')
     upload_electron(release, toolchain_profile_zip, args)
 
-
 def parse_args():
   parser = argparse.ArgumentParser(description='upload distribution file')
   parser.add_argument('-v', '--version', help='Specify the version',
diff --git a/script/zip-symbols.py b/script/zip-symbols.py
index 99ce7f6b52..23521e8230 100755
--- a/script/zip-symbols.py
+++ b/script/zip-symbols.py
@@ -33,9 +33,17 @@ def main():
     dsym_name = 'dsym.zip'
     with scoped_cwd(args.build_dir):
       dsyms = glob.glob('*.dSYM')
+      snapshot_dsyms = ['v8_context_snapshot_generator.dSYM']
+      for dsym in snapshot_dsyms:
+        if (dsym in dsyms):
+          dsyms.remove(dsym)
       dsym_zip_file = os.path.join(args.build_dir, dsym_name)
       print('Making dsym zip: ' + dsym_zip_file)
       make_zip(dsym_zip_file, licenses, dsyms)
+      dsym_snapshot_name = 'dsym-snapshot.zip'
+      dsym_snapshot_zip_file = os.path.join(args.build_dir, dsym_snapshot_name)
+      print('Making dsym snapshot zip: ' + dsym_snapshot_zip_file)
+      make_zip(dsym_snapshot_zip_file, licenses, snapshot_dsyms)
       if len(dsyms) > 0 and 'DELETE_DSYMS_AFTER_ZIP' in os.environ:
         execute(['rm', '-rf'] + dsyms)
   elif PLATFORM == 'win32':