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

Update Windows build script to use explicit package names #200

Merged
merged 2 commits into from
Dec 19, 2023

Conversation

PatTheMav
Copy link
Member

@PatTheMav PatTheMav commented Jul 18, 2023

Description

Updates the Windows build script to explicitly identify dependency "package names" (instead of inferring them implicitly).

Motivation and Context

Allows checking for package name globally and adopt different code paths for each package.

Prerequisite for #186 as caches generated by nightly runs are incompatible with that codebase otherwise.

This change adds new parameter PackageName to the build script which selects the kind of dependency package to build:

When the parameter is omitted, default Windows dependencies are built. If Qt is to be built -PackageName qt needs to be provided instead.

How Has This Been Tested?

Needs to be tested on CI and later with #186 after merging and rebasing.

Types of changes

  • Tweak (non-breaking change to improve existing functionality)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

What would the new build invocations look like with these changes?

Build-Dependencies.ps1 Outdated Show resolved Hide resolved
Build-Dependencies.ps1 Outdated Show resolved Hide resolved
Build-Dependencies.ps1 Show resolved Hide resolved
Build-Dependencies.ps1 Outdated Show resolved Hide resolved
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Probably fine. I'll try to do some quick local testing before giving full approval for next merge window.

Default dependencies and Qt are separates package names that can be
explicitly identified throughout the script and handled in explicit
blocks.
Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Worked fine locally. Seems fine.

@RytoEX RytoEX merged commit 0352a17 into obsproject:master Dec 19, 2023
23 checks passed
@PatTheMav PatTheMav deleted the windows-output-dir branch December 19, 2023 20:56
@RytoEX RytoEX mentioned this pull request Jan 10, 2024
6 tasks
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.

2 participants