-
-
Notifications
You must be signed in to change notification settings - Fork 21.3k
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
Fix compiledb
SCons tool availability
#89481
Fix compiledb
SCons tool availability
#89481
Conversation
SConstruct
Outdated
# SCons | ||
from SCons import __version__ as scons_raw_version | ||
|
||
# SCons version | ||
scons_ver = Environment._get_major_minor_revision(scons_raw_version) |
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 assume black
isn't happy with keeping this included just before it's used?
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.
No, it's just that I thought that it could be a nice global variable. I can set it as it was, if you want.
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.
Yeah I prefer to keep it close to where it's used. It's a hack, using a private API, so it's not something we should encourage to rely on.
We could even drop it and increase the min SCons version to 4.0.0, but that would remove support for Ubuntu 20.04 LTS, which is still commonly used to make custom builds.
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.
Couldn't we build install scons
using pip
on Ubuntu 20.04 LTS?
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.
By the way, I reverted back these lines.
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.
Couldn't we build install
scons
usingpip
on Ubuntu 20.04 LTS?
We don't build on Ubuntu 20.04 LTS, but many users do. And yes they could install SCons with pip, but this adds some friction, and is not a suitable option everywhere (e.g. for distro packaging, though I doubt Ubuntu will start packaging Godot for Ubuntu 20.04).
aa62116
to
6e24980
Compare
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.
Looks fine!
6e24980
to
4080992
Compare
@akien-mga @Riteo Fixed up the superfluous |
Thanks! |
Currently,
scons compiledb compiledb=no
fails to run, as thecompiledb
alias isn't set if thecompiledb
variable isn'tTrue
.This PR makes the
compiledb
tool available for being summoned directly.The variable is only used to indicate that we want to run the
compiledb
tool on the main build.