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

deps.ffmpeg: Fix Visual Studio ID/version for librist #256

Merged
merged 1 commit into from
Jul 30, 2024

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Jul 25, 2024

Description

The year/ID component of the Visual Studio display name is not always the fourth token. As far as I can tell, it is always the last token, so we can just get that. This is what we do in Setup-Target.ps1.

Motivation and Context

See also:

How Has This Been Tested?

I checked the syntax locally with a $VisualStudioData set to a copy of "Visual Studio Build Tools 2022", which is the known offender for the current syntax.

PS C:\> $VisualStudioData

InstanceId          : a63227f3
DisplayName         : Visual Studio Build Tools 2022
InstallationVersion : 17.10.35027.167
InstallationPath    : C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools
InstallDate         : 5/30/2023 1:17:32 PM

PS C:\> ($VisualStudioData.DisplayName -split ' ')[3]
Tools
PS C:\> ($VisualStudioData.DisplayName -split ' ')[-1]
2022

I did not do a full run of the build script, but I did not think it required here.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

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.

The year/ID component of the Visual Studio display name is not always
the fourth token. As far as I can tell, it is always the last token, so
we can just get that. This is what we do in Setup-Target.ps1.
@RytoEX RytoEX requested a review from PatTheMav July 25, 2024 21:04
@RytoEX RytoEX self-assigned this Jul 25, 2024
@RytoEX RytoEX merged commit 72aabe7 into obsproject:master Jul 30, 2024
21 checks passed
@RytoEX RytoEX deleted the fix-librist-find-vs branch July 30, 2024 14:08
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