Skip to content

Commit

Permalink
Build app name in //brave/build/config.gni for sharing
Browse files Browse the repository at this point in the history
And use it in //brave/build/mac/BUILD.gn for applying channel to app and dmg
name.
  • Loading branch information
simonhong committed Jul 3, 2018
1 parent 7380f00 commit 4787658
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
4 changes: 4 additions & 0 deletions build/config.gni
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ if (is_official_build) {
}

brave_product_dir_name = "BraveSoftware/Brave-Browser$brave_product_dir_name_suffix"

if (is_mac) {
brave_target_app_name = "Brave-Browser$brave_product_dir_name_suffix"
}
26 changes: 9 additions & 17 deletions build/mac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@ declare_args() {
_packaging_dir = "$root_out_dir/$brave_product_name Packaging"
keychain_db = getenv("HOME") + "/Library/Keychains/login.${mac_signing_keychain}-db"

_target_app_name = "Brave-Browser"
if (brave_channel == "beta") {
_target_app_name = _target_app_name + "-Beta"
} else if (brave_channel == "dev") {
_target_app_name = _target_app_name + "-Dev"
} else if (brave_channel == "nightly") {
_target_app_name = _target_app_name + "-Nightly"
}
_target_app_path = "$root_out_dir/signing/$_target_app_name.app"
_target_app_path = "$root_out_dir/signing/$brave_target_app_name.app"

action("sign_app") {
brave_app = "$root_build_dir/Brave.app"
Expand Down Expand Up @@ -48,7 +40,7 @@ action("sign_app") {
}

action("create_dmg") {
output = "$root_out_dir/unsigned/$_target_app_name.dmg"
output = "$root_out_dir/unsigned/$brave_target_app_name.dmg"
script = "//build/gn_run_binary.py"
shell_script = "//chrome/installer/mac/pkg-dmg"
inputs = [
Expand All @@ -59,10 +51,10 @@ action("create_dmg") {
args = [
rebase_path(shell_script, root_build_dir),
"--source", "/var/empty",
"--target", "unsigned/$_target_app_name.dmg",
"--target", "unsigned/$brave_target_app_name.dmg",
"--format", "UDBZ",
"--verbosity", "0",
"--volname", "$_target_app_name",
"--volname", "$brave_target_app_name",
"--copy", rebase_path(_target_app_path, root_build_dir),
"--tempdir", "/tmp",
"--symlink", "/Applications",
Expand All @@ -77,16 +69,16 @@ action("sign_dmg") {
inputs = [
script,
shell_script,
"$root_out_dir/unsigned/$_target_app_name.dmg",
"$root_out_dir/unsigned/$brave_target_app_name.dmg",
]
outputs = [ "${root_out_dir}/signing/$_target_app_name.dmg" ]
outputs = [ "${root_out_dir}/signing/$brave_target_app_name.dmg" ]
args = [
rebase_path(shell_script, root_build_dir),
rebase_path("$root_out_dir/unsigned/$_target_app_name.dmg"),
rebase_path("$root_out_dir/$_target_app_name.dmg"),
rebase_path("$root_out_dir/unsigned/$brave_target_app_name.dmg"),
rebase_path("$root_out_dir/$brave_target_app_name.dmg"),
keychain_db,
mac_signing_identifier,
"-r=designated => identifier \"$_target_app_name\" and certificate leaf = H\"$mac_signing_identifier\"",
"-r=designated => identifier \"$brave_target_app_name\" and certificate leaf = H\"$mac_signing_identifier\"",
]

deps = [":create_dmg"]
Expand Down

0 comments on commit 4787658

Please sign in to comment.