Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1499 from brave/use_skip_signing_on_windows

Browse Source 
Enable --skip_signing subcommand of create_dist on Windows
This commit is contained in:
Simon Hong
2019-01-30 13:43:10 +09:00
committed by GitHub
parent b6ad9c3f9c b662157718
commit cab2ee4e72
4 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/win/BUILD.gn
+3
View File
@@ -49,6 +49,9 @@ action("create_signed_installer") {
"--root_out_dir=$out_dir",
"--brave_installer_exe=$brave_installer_exe",
]
if (skip_signing) { args += [ "--skip_signing" ] }
deps = [
"//chrome/installer/mini_installer"
]
patches/chrome-installer-mini_installer-BUILD.gn.patch
+14 -2
View File
@@ -1,12 +1,24 @@
diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn
index 931761ff27de83f8ac6ce6b0211b7eaa1151c5cb..14fcfe917fbff1a7147135e4e7b96b2a9078d267 100644
index 931761ff27de83f8ac6ce6b0211b7eaa1151c5cb..76b0b5884dee55ee6cbb22e999c921108ca597f2 100644
--- a/chrome/installer/mini_installer/BUILD.gn
+++ b/chrome/installer/mini_installer/BUILD.gn
@@ -181,6 +181,21 @@ template("generate_mini_installer") {
@@ -12,6 +12,10 @@ import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
import("//ui/base/ui_features.gni")
import("//v8/gni/v8.gni")
+if (brave_chromium_build) {
+ import("//brave/build/config.gni")
+}
+
declare_args() {
# The Chrome archive is compressed in official builds to reduce the size of
# the installer. By default: non-official or component builds, a build mode
@@ -181,6 +185,22 @@ template("generate_mini_installer") {
"//third_party/icu:icudata",
chrome_dll_target,
]
+ if (brave_chromium_build) {
+ if (skip_signing) { args += [ "--skip_signing" ] }
+ inputs -= [
+ "$root_out_dir/chrome.exe",
+ ]
patches/chrome-tools-build-win-create_installer_archive.py.patch
+14 -4
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py
index 0e12f2a17d11bdde2470330b6437f3254e3d1be7..504b38c805c2fa4190a4d0088318374ba27dce69 100755
index 0e12f2a17d11bdde2470330b6437f3254e3d1be7..b70f73cfb733e7fe3c4539c31743a478202bfd54 100755
--- a/chrome/tools/build/win/create_installer_archive.py
+++ b/chrome/tools/build/win/create_installer_archive.py
@@ -109,6 +109,60 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
@@ -63,13 +63,23 @@ index 0e12f2a17d11bdde2470330b6437f3254e3d1be7..504b38c805c2fa4190a4d0088318374b
def CopySectionFilesToStagingDir(config, section, staging_dir, src_dir):
"""Copies installer archive files specified in section from src_dir to
@@ -557,6 +611,9 @@ def main(options):
@@ -557,6 +611,10 @@ def main(options):
version_numbers = prev_version.split('.')
prev_build_number = version_numbers[2] + '.' + version_numbers[3]
+ from sign_binaries import sign_binaries
+ sign_binaries(staging_dir)
+ if not options.skip_signing:
+ from sign_binaries import sign_binaries
+ sign_binaries(staging_dir)
+
# Name of the archive file built (for example - chrome.7z or
# patch-<old_version>-<new_version>.7z or patch-<new_version>.7z
archive_file = CreateArchiveFile(options, staging_dir,
@@ -625,6 +683,8 @@ def _ParseOptions():
'with the installer archive {x86|x64}.')
parser.add_option('-v', '--verbose', action='store_true', dest='verbose',
default=False)
+ parser.add_option('--skip_signing', default=False)
+
options, _ = parser.parse_args()
if not options.build_dir:
script/create-signed-installer.py
+5 -3
View File
@@ -11,21 +11,23 @@ def main():
os.path.dirname(os.path.dirname(os.path.dirname(
os.path.realpath(__file__)))),
args.root_out_dir[0])
create_signed_installer(root_out_dir, args.brave_installer_exe[0])
create_signed_installer(root_out_dir, args.brave_installer_exe[0], args.skip_signing)
def parse_args():
parser = argparse.ArgumentParser(description='Create signed installer')
parser.add_argument('--root_out_dir', nargs=1)
parser.add_argument('--brave_installer_exe', nargs=1)
parser.add_argument('--skip_signing', action='store_true')
return parser.parse_args()
def create_signed_installer(root_out_dir, brave_installer_exe, env=None):
def create_signed_installer(root_out_dir, brave_installer_exe, skip_signing, env=None):
installer_file = os.path.join(root_out_dir, 'brave_installer.exe')
shutil.copyfile(os.path.join(root_out_dir, 'mini_installer.exe'),
installer_file)
sign_binary(installer_file)
if not skip_signing:
sign_binary(installer_file)
# Copy signed installer to version appended name
installer_file_with_version = os.path.join(root_out_dir,
brave_installer_exe)