Skip to content

Commit

Permalink
Merge pull request #1469 from brave/mac-installer-sign-pkg
Browse files Browse the repository at this point in the history
Add options for installer signing key on Mac
  • Loading branch information
emerick authored Oct 11, 2018
2 parents 7792f76 + aafc220 commit dafcdd7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions build/commands/lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ const Config = function () {
this.chromeVersion = getNPMConfig(['projects', 'chrome', 'tag']) || '0.0.0.0'
this.releaseTag = this.braveVersion.split('+')[0]
this.mac_signing_identifier = getNPMConfig(['mac_signing_identifier']) || ''
this.mac_installer_signing_identifier = getNPMConfig(['mac_installer_signing_identifier']) || ''
this.mac_signing_keychain = getNPMConfig(['mac_signing_keychain']) || 'login'
this.channel = ''
this.sccache = getNPMConfig(['sccache'])
Expand Down Expand Up @@ -87,6 +88,7 @@ Config.prototype.buildArgs = function () {

if (process.platform === 'darwin') {
args.mac_signing_identifier = this.mac_signing_identifier
args.mac_installer_signing_identifier = this.mac_installer_signing_identifier
args.mac_signing_keychain = this.mac_signing_keychain
}

Expand Down Expand Up @@ -262,6 +264,9 @@ Config.prototype.update = function (options) {
if (options.mac_signing_identifier)
this.mac_signing_identifier = options.mac_signing_identifier

if (options.mac_installer_signing_identifier)
this.mac_installer_signing_identifier = options.mac_installer_signing_identifier

if (options.mac_signing_keychain)
this.mac_signing_keychain = options.mac_signing_keychain

Expand Down
1 change: 1 addition & 0 deletions build/commands/scripts/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ program
.option('-C <build_dir>', 'build config (out/Debug, out/Release')
.option('--target_arch <target_arch>', 'target architecture', 'x64')
.option('--mac_signing_identifier <id>', 'The identifier to use for signing')
.option('--mac_installer_signing_identifier <id>', 'The identifier to use for signing the installer')
.option('--mac_signing_keychain <keychain>', 'The identifier to use for signing', 'login')
.option('--debug_build <debug_build>', 'keep debugging symbols')
.option('--official_build <official_build>', 'force official build settings')
Expand Down

0 comments on commit dafcdd7

Please sign in to comment.