Skip to content

Only creates dist package for specified channel on linux #209

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 3, 2018
Merged

Only creates dist package for specified channel on linux #209

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27fff42
Only creates dist package for specified channel on linux
simonhong Jun 30, 2018
0b780bf
Move linux channel mapping logic to //brave/build/config.gni
simonhong Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,15 @@ group("create_dist") {
deps += [ "build/mac:create_dist_mac" ]
}
if (is_linux) {
_linux_channel = brave_channel
if (brave_channel == "") {
_linux_channel = "stable"
} else if (brave_channel == "dev") {
_linux_channel = "unstable"
Copy link
Collaborator

Choose a reason for hiding this comment

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

other options for brave_channel are unchanged for linux?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, beta is used as-is.
nightly is not supported yet on linux and will be added (brave/brave-browser#461)

Copy link
Collaborator

Choose a reason for hiding this comment

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

can we wrap these things together as I suggested in the other post so brave_channel is corrected for linux in //brave/build/config.gni ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, this value and others mentioned in #208 (comment), can be wrapped there.

But I'm not sure we can fetch that values from c++.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I was thinking a public_config with defines or a generated header file?

Copy link
Member Author

Choose a reason for hiding this comment

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

ok, I'll try!

Copy link
Member Author

Choose a reason for hiding this comment

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

Moved to //brave//build/config.gni. PTAL.

}

deps += [
"//chrome/installer/linux",
"//chrome/installer/linux:$_linux_channel",
"//brave/app/linux:dist_resources",
]
}
Expand Down