Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy proper app icon to /chrome/app/theme/mac/app.icns #653

Merged
merged 1 commit into from
Jul 27, 2018

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Jul 27, 2018

With this, we can avoid patching chrome/BUILD.gn for this.

issue: #652

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions

lib/util.js Outdated
// Each channel's app icons are stored in brave/app/theme/$channel/app.icns.
// With this copying, we don't need to modify chrome/BUILD.gn for this.
let channel = config.channel
if (config.debugBuild)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this already be correct in config.channel? If not I think we should set it in config.js and not here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah,, debug build uses different app icon with other four channel app icons.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

understood, what I'm saying is that the channel name (development) should be set in config.js, not here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, do you mean setting development to config.channel in debug build?

Oh, my previous comment was pending state :) I'll try to check this channel setting doesn't break anything.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should be checking the channel name here and doing any required icon name mapping, not checking debugBuild

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't necessarily have to set the channel to development, but it should be set to whatever makes sense for debugBuilds and then map from that to development for the icon path

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using development for channel in debug build?
I think it's fine because icon is stored under development folder/

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fine with me, but check with @mbacchi to be sure

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be fine because debug build is only used for local development build.
WDYT? @mbacchi

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to set development to channel name.
How about merging this first and revisit here when @mbacchi comments something because mac release build is broken for now?

With this, we can avoid patching chrome/BUILD.gn for this.
@simonhong simonhong force-pushed the copy_mac_app_icon branch from 99d4ee7 to 4f7acc4 Compare July 27, 2018 02:17
@simonhong simonhong merged commit d5bc16f into master Jul 27, 2018
@simonhong simonhong deleted the copy_mac_app_icon branch July 27, 2018 02:32
@mbacchi
Copy link
Contributor

mbacchi commented Jul 27, 2018

Sorry I meant to respond last evening but got sidetracked. I think either @RyanJarv or @bkero would be better to look into the mac build stuff related to this, they've been more involved with OSX builds than I.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants