-
Notifications
You must be signed in to change notification settings - Fork 867
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
Make mini installer for non-stable channel work properly #214
Conversation
a9b3b04
to
593a5cc
Compare
--- a/chrome/installer/util/BUILD.gn | ||
+++ b/chrome/installer/util/BUILD.gn | ||
@@ -246,9 +246,16 @@ action("generate_strings") { | ||
@@ -246,9 +246,22 @@ action("generate_strings") { | ||
"$target_gen_dir/installer_util_strings.rc", | ||
] | ||
|
||
+ brand = "$branding_path_component" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we changing the branding_path_component here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is not introduced in this PR.
brave/brave-browser#153 tracks this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, you're right. I'm going to take a look at that issue
+ # TODO(shong): Remove this. | ||
+ brand = brand + "-development" | ||
+ if (brave_chromium_build) { | ||
+ # When brave_strings.grd is modified, outputs should be re-generated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this script uses chromium_strings.grd as the grd file so why are we adding brave_strings.grd as a source?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
//chrome/installer/util::generate_strings
uses create_string_rc.py
and that script uses brave_strings.grd
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That seems like a strange way to handle it. Can we mark this whole thing as a temporary workaround and not just the -development
part? Open a new issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
brave_strings.grd
is not related with brand. What do you mean?
Also, you think our changes in create_string_rc.py
should be changed too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm saying that putting brave_strings.grd
inside create_string_rc.py
doesn't seem like the best way to handle this and that's what I'd like to open another ticket for.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. I'll create new issue for that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added more comment and brave/brave-browser#472 is created for this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have more comment on this PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, no. I'll approve
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for kind review!
It was not installed properly because needed string was empty.
593a5cc
to
256f5aa
Compare
@@ -137,11 +137,14 @@ If you update this file, be sure also to update google_chrome_strings.grd. --> | |||
Brave | |||
</message> | |||
<if expr="is_win"> | |||
<message name="IDS_SXS_SHORTCUT_NAME" desc="Unused in Brave builds" translateable="false"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be in the rebaes_l10n script since this file is generated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll handle it, but for future reference we never want to modify .grd
files in patches
https://github.com/brave/brave-browser/blob/master/lib/l10nUtil.js#L87
It was not installed properly because needed string was empty.
Also, brave_strings.grd is added to generate_strings's source list to trigger re-generation.
With this PR, mini_installer.exe installs all non-stable channels well.
Issue: brave/brave-browser#396
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test Plan:
mini_installer.exe --chrome-beta
for beta channel.mini_installer.exe --chrome-dev
for dev channel.mini_installer.exe --chrome-sxs
for nightly channel.Reviewer Checklist: