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

Fix Windows build busters. #929

Merged
merged 1 commit into from
Nov 26, 2023

Conversation

acolwell
Copy link
Collaborator

@acolwell acolwell commented Oct 16, 2023

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?
This change fixes the Windows build. Recently msys2 updated pyside2/shiboken2 to version 5.15.11. This caused the build to start complaining about types like std::uint32_t & std::uint64_t being undefined when running shiboken2 to generate python stubs. This change makes the code always include cstdint since the typedefs derived from cstdint types are not guarded by #ifdefs. A few other minor changes were made to make the build process a little more robust.

This pull request contains the following changes:

  • Always include cstdint in GlobalDefines.h to avoid missing decl errors.
  • Change NATRON_BUILD_WORKSPACE to a shorter path to avoid path length errors that can occur during python file compilation.
  • Change logic in build-Windows-installer.sh related to mt.exe and the Qt Installer Framework so that these binaries could be retrieved from the Windows SDK and msys2 respectively.

Have you tested your changes (if applicable)? If so, how?

Yes. The "Build Installer" and "Tests" GitHub actions build on Windows again. (https://github.com/acolwell/Natron/actions/runs/6537802581)
(https://github.com/acolwell/Natron/actions/runs/6539421923)

- Always include cstdint in GlobalDefines.h to avoid missing decl errors.
- Change NATRON_BUILD_WORKSPACE to a shorter path to avoid path length
  errors that can occur during python file compilation.
- Change logic in build-Windows-installer.sh related to mt.exe and
  the Qt Installer Framework so that these binaries could be retrieved
  from the Windows SDK and msys2 respectively.
@acolwell acolwell force-pushed the fix_missing_std_int_decls branch from a5a93f4 to cc3bea0 Compare October 16, 2023 22:13
@acolwell
Copy link
Collaborator Author

Friendly ping. The windows builds are broken without this fix and it appears the Linux has also started to fail with similar shiboken issues.

@acolwell acolwell requested a review from devernay November 14, 2023 15:15
Copy link
Member

@devernay devernay left a comment

Choose a reason for hiding this comment

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

LGTM!

@acolwell acolwell merged commit 4b44fb1 into NatronGitHub:RB-2.5 Nov 26, 2023
2 checks passed
@acolwell acolwell deleted the fix_missing_std_int_decls branch November 26, 2023 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants