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

cmake: Fix build directory exclusion #11501

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

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Nov 8, 2024

Description

The regex was incorrectly excluding any file with build in the name. The intent was to exclude any build directories, so we should be able to restrict this.

Motivation and Context

Fixes #11443.

How Has This Been Tested?

It hasn't.

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 regex was incorrectly excluding any file with build in the name. The
intent was to exclude any build directories, so we should be able to
restrict this.
@RytoEX RytoEX added Bug Fix Non-breaking change which fixes an issue Linux Affects Linux labels Nov 8, 2024
@RytoEX RytoEX added this to the OBS Studio 31 milestone Nov 8, 2024
@RytoEX RytoEX requested a review from PatTheMav November 8, 2024 20:42
@RytoEX RytoEX self-assigned this Nov 8, 2024
@@ -16,7 +16,7 @@ endif()

set(CPACK_SOURCE_PACKAGE_FILE_NAME "obs-studio-${CPACK_PACKAGE_VERSION}-sources")
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES "/.git" "/.*build.*" "/.ccache" "/.deps")
set(CPACK_SOURCE_IGNORE_FILES "/.git" "/build.*" "/.ccache" "/.deps")
Copy link
Member

Choose a reason for hiding this comment

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

This make it still ignore buildspec.json as that matches the regular expression build.* - that file is also missing from the tarball.

@PatTheMav
Copy link
Member

I'm not sure if the "proper" fix is to remove the tarball entirely - given that only one user has reported that defect (and didn't even notice the entire extent of it), it seems like we already spent too much maintenance effort on a very niche requirement.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Fix Non-breaking change which fixes an issue Linux Affects Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[31.0.0-beta2] - source tarball is missing cmake/common/{buildnumber.cmake,buildspec_common.cmake}
2 participants