Skip to content

Commit

Permalink
Merge pull request #2782 from brave/dmg_graphics
Browse files Browse the repository at this point in the history
Update mac installer update
  • Loading branch information
bsclifton authored Jun 25, 2019
2 parents ef87c6d + 721a5c1 commit 13df075
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions build/mac/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,24 @@ declare_args() {

group("brave") {}

ds_store_file_name = "DS_Store"
dmg_icon_file_name = "dmg"

if (brave_channel != "") {
ds_store_file_name = "DS_Store.$brave_channel"
dmg_icon_file_name = "dmg-$brave_channel"
}
dmg_background_image = rebase_path("//brave/build/mac/dmg-background.png")
ds_store = rebase_path("//brave/build/mac/$ds_store_file_name")
dmg_icon = rebase_path("//brave/build/mac/$dmg_icon_file_name.icns")

if (skip_signing) {
action("unsigned_dmg") {
brave_app = "$root_build_dir/$brave_exe"
output = "$root_out_dir/unsigned_dmg/$brave_dmg"
script = "//build/gn_run_binary.py"
shell_script = "//chrome/installer/mac/pkg-dmg"

inputs = [
script,
shell_script,
Expand All @@ -34,6 +46,10 @@ if (skip_signing) {
"--volname", "$chrome_product_full_name",
"--copy", rebase_path(brave_app, root_build_dir),
"--tempdir", "/tmp",
"--mkdir", ".background",
"--copy", "$dmg_background_image:/.background/dmg-background.png",
"--copy", "$ds_store:/.DS_Store",
"--icon", "$dmg_icon",
"--symlink", "/Applications",
]

Expand Down Expand Up @@ -201,6 +217,10 @@ if (skip_signing) {
"--volname", "$chrome_product_full_name",
"--copy", rebase_path(target_sign_app_path, root_build_dir),
"--tempdir", "/tmp",
"--mkdir", ".background",
"--copy", "$dmg_background_image:/.background/dmg-background.png",
"--copy", "$ds_store:/.DS_Store",
"--icon", "$dmg_icon",
"--symlink", "/Applications",
]

Expand Down
Binary file added build/mac/DS_Store
Binary file not shown.
Binary file added build/mac/DS_Store.beta
Binary file not shown.
Binary file added build/mac/DS_Store.dev
Binary file not shown.
Binary file added build/mac/DS_Store.nightly
Binary file not shown.
Binary file added build/mac/dmg-background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/mac/dmg-beta.icns
Binary file not shown.
Binary file added build/mac/dmg-dev.icns
Binary file not shown.
Binary file added build/mac/dmg-nightly.icns
Binary file not shown.
Binary file added build/mac/dmg.icns
Binary file not shown.

0 comments on commit 13df075

Please sign in to comment.