mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium to 112.0.5615.10 * 4240798: Get rid of ShowInvalidPrinterSettingsError() in PrintManagerHost. https://chromium-review.googlesource.com/c/chromium/src/+/4240798 * chore: fixup patch * 4173660: Remove unused argument in BeforeUnloadCompleted Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4173660 (cherry picked from commit6d3934f743) * refactor: base value type DICTIONARY replaced with DICT Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4198081 (cherry picked from commitb7acb5c9a4) * 4251237: [StorageKey Cleanup] (2) Rename CreateFirstParty constructors Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4251237 (cherry picked from commit31bdd549d0) * refactor: rename latency metrics Refs: https://chromium-review.googlesource.com/c/chromium/src/+/4048262 (cherry picked from commit1e1b97d387) * refactor: base::span explicit conversion checks Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4219636 (cherry picked from commit020e8c6aae) * chore: iwyu net/cert/cert_verify_result.h (cherry picked from commit24583f5583) * 4258446: Move network::mojom::ClearDataFilter to its own mojom file https://chromium-review.googlesource.com/c/chromium/src/+/4258446 (cherry picked from commit5ff47109cd) * refactor: refactoring geolocation manager Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4161603 (cherry picked from commit1eeaafb45c) * refactor: use modern base values in tracing Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4210912 (cherry picked from commit192c988c1e) * refactor: add sanitized context to clipboard write Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4178264 (cherry picked from commit3ef020b5e5) * 4256866: [Extensions] Replace GetHooksForAPI with a RegisterHooksDelegate Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4256866 (cherry picked from commitb9d905216a) * refactor: s/Rect/WindowFeatures Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4167001 (cherry picked from commit12d121265b) * 4226656: Add response url to SimpleURLLoader::OnRedirectCallback Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4226656 (cherry picked from commit9f66c47930) * Better approach for ShowInvalidPrinterSettingsError() removal * build: use xcode 14 (cherry picked from commit06bd2c0442) * build: update appveyor image 4072083: New toolchain for Windows 11 10.0.22621.755 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/4072083 (cherry picked from commit437c49898f) * 4261434: Remove browser_watcher (1/3): Move ExitCodeWatcher to chrome/app https://chromium-review.googlesource.com/c/chromium/src/+/4261434 (cherry picked from commitedc90d9488) * 4128591: Enable large pdbs by default https://chromium-review.googlesource.com/c/chromium/src/+/4128591 (cherry picked from commite76f2c3f16) * move dbgcore/dbghelp to extensions_to_skip (cherry picked from commit8eeb555145) * 4273450: dpwas: Send announcement when live regions changed https://chromium-review.googlesource.com/c/chromium/src/+/4273450 * 4277708: win7dep: Remove ResolveCoreWinRTStringDelayload https://chromium-review.googlesource.com/c/chromium/src/+/4277708 * Roll clang+rust llvmorg-17-init-3170-g6e30dffe-1 : llvmorg-17-init-3874-g93a2fecc-1 / [skipping Rust] https://chromium-review.googlesource.com/c/chromium/src/+/4308214 * 4285717: Copy d3dcompiler_47.dll on ARM64 Windows builds https://chromium-review.googlesource.com/c/angle/angle/+/4285717 * Revert "Roll clang+rust llvmorg-17-init-3170-g6e30dffe-1 : llvmorg-17-init-3874-g93a2fecc-1 / [skipping Rust]" This reverts commit71080f4f2d. * Revert Roll clang+rust llvmorg-16-init-17653-g39da55e8-3 This clang roll breaks Linux arm 32-bit --------- Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: electron-patch-conflict-fixer[bot] <83340002+electron-patch-conflict-fixer[bot]@users.noreply.github.com>
118 lines
3.7 KiB
Python
118 lines
3.7 KiB
Python
#!/usr/bin/env python3
|
|
from __future__ import print_function
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import zipfile
|
|
|
|
EXTENSIONS_TO_SKIP = [
|
|
'.pdb',
|
|
'.mojom.js',
|
|
'.mojom-lite.js',
|
|
'.info',
|
|
'.m.js',
|
|
|
|
# These are only needed for Chromium tests we don't run. Listed in
|
|
# 'extensions' because the mksnapshot zip has these under a subdirectory, and
|
|
# the PATHS_TO_SKIP is checked with |startswith|.
|
|
'dbgcore.dll',
|
|
'dbghelp.dll',
|
|
]
|
|
|
|
PATHS_TO_SKIP = [
|
|
# Skip because it is an output of //ui/gl that we don't need.
|
|
'angledata',
|
|
# Skip because these are outputs that we don't need.
|
|
'./libVkICD_mock_',
|
|
# Skip because these are outputs that we don't need.
|
|
'./VkICD_mock_',
|
|
# Skip because its an output of create_bundle from
|
|
# //build/config/mac/rules.gni that we don't need
|
|
'Electron.dSYM',
|
|
# Refs https://chromium-review.googlesource.com/c/angle/angle/+/2425197.
|
|
# Remove this when Angle themselves remove the file:
|
|
# https://issuetracker.google.com/issues/168736059
|
|
'gen/angle/angle_commit.h',
|
|
# //chrome/browser:resources depends on this via
|
|
# //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
|
|
# ship it.
|
|
'pyproto',
|
|
# Skip because these are outputs that we don't need.
|
|
'resources/inspector',
|
|
'gen/third_party/devtools-frontend/src',
|
|
'gen/ui/webui',
|
|
]
|
|
|
|
def skip_path(dep, dist_zip, target_cpu):
|
|
# Skip specific paths and extensions as well as the following special case:
|
|
# snapshot_blob.bin is a dependency of mksnapshot.zip because
|
|
# v8_context_generator needs it, but this file does not get generated for arm
|
|
# and arm 64 binaries of mksnapshot since they are built on x64 hardware.
|
|
# Consumers of arm and arm64 mksnapshot can generate snapshot_blob.bin
|
|
# themselves by running mksnapshot.
|
|
should_skip = (
|
|
any(dep.startswith(path) for path in PATHS_TO_SKIP) or
|
|
any(dep.endswith(ext) for ext in EXTENSIONS_TO_SKIP) or
|
|
(
|
|
"arm" in target_cpu
|
|
and dist_zip == "mksnapshot.zip"
|
|
and dep == "snapshot_blob.bin"
|
|
)
|
|
)
|
|
if should_skip:
|
|
print("Skipping {}".format(dep))
|
|
return should_skip
|
|
|
|
def execute(argv):
|
|
try:
|
|
output = subprocess.check_output(argv, stderr=subprocess.STDOUT)
|
|
return output
|
|
except subprocess.CalledProcessError as e:
|
|
print(e.output)
|
|
raise e
|
|
|
|
def main(argv):
|
|
dist_zip, runtime_deps, target_cpu, _, flatten_val, flatten_relative_to = argv
|
|
should_flatten = flatten_val == "true"
|
|
dist_files = set()
|
|
with open(runtime_deps) as f:
|
|
for dep in f.readlines():
|
|
dep = dep.strip()
|
|
if not skip_path(dep, dist_zip, target_cpu):
|
|
dist_files.add(dep)
|
|
if sys.platform == 'darwin' and not should_flatten:
|
|
execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
|
|
else:
|
|
with zipfile.ZipFile(
|
|
dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True
|
|
) as z:
|
|
for dep in dist_files:
|
|
if os.path.isdir(dep):
|
|
for root, _, files in os.walk(dep):
|
|
for filename in files:
|
|
z.write(os.path.join(root, filename))
|
|
else:
|
|
basename = os.path.basename(dep)
|
|
dirname = os.path.dirname(dep)
|
|
arcname = (
|
|
os.path.join(dirname, 'chrome-sandbox')
|
|
if basename == 'chrome_sandbox'
|
|
else dep
|
|
)
|
|
name_to_write = arcname
|
|
if should_flatten:
|
|
if flatten_relative_to:
|
|
if name_to_write.startswith(flatten_relative_to):
|
|
name_to_write = name_to_write[len(flatten_relative_to):]
|
|
else:
|
|
name_to_write = os.path.basename(arcname)
|
|
else:
|
|
name_to_write = os.path.basename(arcname)
|
|
z.write(
|
|
dep,
|
|
name_to_write,
|
|
)
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(main(sys.argv[1:]))
|