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

[4.0] SCons: Fix BoolVariable import for SCons 4.8.0+ #1526

Open
wants to merge 1 commit into
base: 4.0
Choose a base branch
from

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Jul 17, 2024

See godotengine/godot#94410 and https://stackoverflow.com/questions/78746956/error-name-boolvariable-is-not-defined-when-using-scons-on-godot-with-c for details.

Not needed in master as this was already changed by #1504.

Should be cherry-picked for 4.1 and 4.0, doesn't seem needed in 3.x/3.5.

@akien-mga akien-mga added bug This has been identified as a bug topic:buildsystem Related to the buildsystem or CI setup cherrypick:4.0 cherrypick:4.1 labels Jul 17, 2024
@akien-mga akien-mga added this to the 4.2 milestone Jul 17, 2024
@akien-mga akien-mga requested a review from a team as a code owner July 17, 2024 12:18
@Faless
Copy link
Contributor

Faless commented Jul 17, 2024

See discussion in #1518 (which this PR fixes)

@dsnopek
Copy link
Collaborator

dsnopek commented Jul 17, 2024

I intend to cherry-pick #1504, so a separate PR just for this change isn't necessary

UPDATE: Er, well, I wasn't planning to cherry-pick to 4.0, so if we want this in 4.0 that probably will need it's own PR. We've kept the build system for 4.1, 4.2 and master in pretty close sync, but 4.0 is quite different at this point.

@dsnopek
Copy link
Collaborator

dsnopek commented Jul 17, 2024

Here's the next 4.2 cherry-picking PR (which includes this changes via PR #1504): #1527

@dsnopek
Copy link
Collaborator

dsnopek commented Jul 17, 2024

And here's the 4.1 cherry-pick: #1529

So, at this point, maybe this PR could be reworked to bring this change to the 4.0 branch, since I don't intend to cherry-pick PR #1504 to 4.0?

@akien-mga akien-mga changed the base branch from 4.2 to 4.0 July 18, 2024 08:24
@akien-mga akien-mga requested a review from a team as a code owner July 18, 2024 08:24
@akien-mga akien-mga force-pushed the 4.2-fix-scons-4.8.0 branch from e92d324 to 8e22ac2 Compare July 18, 2024 08:24
@akien-mga akien-mga changed the title [4.2] SCons: Fix BoolVariable import for SCons 4.8.0+ [4.0] SCons: Fix BoolVariable import for SCons 4.8.0+ Jul 18, 2024
@akien-mga
Copy link
Member Author

So, at this point, maybe this PR could be reworked to bring this change to the 4.0 branch, since I don't intend to cherry-pick PR #1504 to 4.0?

Done!

Copy link
Collaborator

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

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

Thanks!

@dsnopek
Copy link
Collaborator

dsnopek commented Jul 22, 2024

I suspect the CI builds are stuck because we didn't cherry-pick PR #1496 to 4.0. I just added the cherrypick:4.0 label there

@dsnopek
Copy link
Collaborator

dsnopek commented Jul 22, 2024

PR #1533 does the few cherry-picks we have for 4.0. Let's see if that manages to finish CI!

@dsnopek
Copy link
Collaborator

dsnopek commented Jul 23, 2024

Rebasing this on the latest 4.0 branch will probably get the CI passing, now that PR #1533 is merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This has been identified as a bug topic:buildsystem Related to the buildsystem or CI setup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants