Michael Herrmann
dd118e8db2
Previously, trying to generate a delta update with
--last_chrome_installer from the same source and target versions gave:
...
Did not find an archive input file for ".../chrome.dll"
Now we get:
Cannot create delta update files between the same source and target
version 99.1.38.5. Please increment the Chrome version (for
instance by rebasing your changes against a later upstream
version). Or pass files representing a lower version to
--last_chrome_installer.
This commit also fixes some pylint errors in the affected code.
84 lines
3.9 KiB
Python
84 lines
3.9 KiB
Python
#!/usr/bin/env python
|
|
|
|
# Copyright (c) 2019 The Brave Authors. All rights reserved.
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
# You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
import os
|
|
import shutil
|
|
|
|
CHROME_DIR = "Chrome-bin"
|
|
|
|
|
|
def CheckDeltaUpdatePrecondition(last_chrome_installer, prev_version,
|
|
curr_version):
|
|
if last_chrome_installer and prev_version == curr_version:
|
|
raise Exception("Cannot create delta update files between the same "
|
|
"source and target version %s. Please increment the "
|
|
"Chrome version (for instance by rebasing your changes "
|
|
"against a later upstream version). Or pass files "
|
|
"representing a lower version to "
|
|
"--last_chrome_installer." % prev_version)
|
|
|
|
|
|
def SignAndCopyPreSignedBinaries(skip_signing, output_dir, staging_dir,
|
|
current_version):
|
|
if not skip_signing:
|
|
from sign_binaries import sign_binaries, sign_binary
|
|
sign_binaries(staging_dir)
|
|
sign_binary(os.path.join(output_dir, 'setup.exe'))
|
|
# Copies already signed three binaries - brave.exe and chrome.dll
|
|
# These files are signed during the build phase to create widevine sig
|
|
# files.
|
|
src_dir = os.path.join(output_dir, 'signed_binaries')
|
|
chrome_dir = os.path.join(staging_dir, CHROME_DIR)
|
|
version_dir = os.path.join(chrome_dir, current_version)
|
|
shutil.copy(os.path.join(src_dir, 'brave.exe'), chrome_dir)
|
|
shutil.copy(os.path.join(src_dir, 'chrome.dll'), version_dir)
|
|
|
|
|
|
def BraveCopyAllFilesToStagingDir(config, staging_dir, g_archive_inputs):
|
|
current_dir = os.path.realpath(os.path.dirname(os.path.realpath(__file__)))
|
|
|
|
brave_extension_locales_src_dir_path = os.path.realpath(
|
|
os.path.join(current_dir, os.pardir, 'components',
|
|
'brave_extension', 'extension', 'brave_extension',
|
|
'_locales'))
|
|
CopyExtensionLocalization('brave_extension',
|
|
brave_extension_locales_src_dir_path,
|
|
config, staging_dir, g_archive_inputs)
|
|
|
|
brave_rewards_locales_src_dir_path = os.path.realpath(
|
|
os.path.join(current_dir, os.pardir, 'components',
|
|
'brave_rewards', 'resources', 'extension', 'brave_rewards',
|
|
'_locales'))
|
|
CopyExtensionLocalization('brave_rewards',
|
|
brave_rewards_locales_src_dir_path,
|
|
config, staging_dir, g_archive_inputs)
|
|
|
|
|
|
def CopyExtensionLocalization(extension_name, locales_src_dir_path, config,
|
|
staging_dir, g_archive_inputs):
|
|
"""Copies extension localization files from locales_src_dir_path to
|
|
\\<out_gen_dir>\\chrome\\installer\\mini_installer\\mini_installer
|
|
\\temp_installer_archive\\Chrome-bin\\<version>\\resources\\extension_name
|
|
\\_locales
|
|
"""
|
|
locales_dest_path = staging_dir
|
|
locales_dest_path = os.path.join(locales_dest_path,
|
|
config.get('GENERAL',
|
|
'brave_resources.pak'),
|
|
'resources', extension_name, '_locales')
|
|
locales_dest_path = os.path.realpath(locales_dest_path)
|
|
shutil.rmtree(locales_dest_path, ignore_errors=True)
|
|
shutil.copytree(locales_src_dir_path, locales_dest_path)
|
|
# Files are copied, but we need to inform g_archive_inputs about that
|
|
for root, _, files in os.walk(locales_dest_path):
|
|
for name in files:
|
|
rel_dir = os.path.relpath(root, locales_dest_path)
|
|
rel_file = os.path.join(rel_dir, name)
|
|
candidate = os.path.join(
|
|
'.', 'resources', extension_name, '_locales', rel_file)
|
|
g_archive_inputs.append(candidate)
|