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

Alias platform=x11 to platform=linuxbsd in SCons #37369

Merged
merged 1 commit into from
Mar 28, 2020

Conversation

Calinou
Copy link
Member

@Calinou Calinou commented Mar 27, 2020

This makes it possible for users to follow outdated documentation and still get a working binary.

PS: We might want to do the opposite in the 3.2 branch (alias linuxbsd to x11). This way, people can also follow documentation intended for 4.0 to build Godot 3.2. I expect that to be quite common if we update the Compiling for X11 page in the master branch…

Edit: This now aliases linux and bsd to linuxbsd for convenience as well.

This closes #37367.

@Calinou Calinou force-pushed the scons-x11-alias-linuxbsd branch 2 times, most recently from 607a39c to 1402c38 Compare March 27, 2020 22:54
@aaronfranke
Copy link
Member

Can we also add a linux alias, but have it be permanent? Maybe also a bsd alias.

@realkotob
Copy link
Contributor

I agree with @aaronfranke, this should help reduce accidental build frustrations for new users.

Unless we reach 5+ aliases I don't think it'll cause any confusion.

@Calinou Calinou force-pushed the scons-x11-alias-linuxbsd branch from 1402c38 to 56ca1ff Compare March 28, 2020 13:32
@Calinou
Copy link
Member Author

Calinou commented Mar 28, 2020

I added aliases for linux and bsd as well. People may end up using those accidentally, so it's better to redirect to linuxbsd automatically rather than erroring out.

@Calinou Calinou added this to the 4.0 milestone Mar 28, 2020
@Calinou Calinou force-pushed the scons-x11-alias-linuxbsd branch from 56ca1ff to 5fb7e6e Compare March 28, 2020 16:57
This makes it possible for users to follow outdated documentation
and still get a working binary.

This closes godotengine#37367.
@Calinou Calinou force-pushed the scons-x11-alias-linuxbsd branch from 5fb7e6e to 59fbbdc Compare March 28, 2020 17:20
@akien-mga akien-mga merged commit fc5e1d0 into godotengine:master Mar 28, 2020
@akien-mga
Copy link
Member

Thanks!

accidentalrebel added a commit to accidentalrebel/godot that referenced this pull request Mar 31, 2020
Fixes godotengine#37465. The godotengine#37369 commit which added an alias for linuxbsd
platform did not work with the latest branch.
@Calinou Calinou deleted the scons-x11-alias-linuxbsd branch April 27, 2020 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scons does not detect X11
4 participants