osxbundle: read version from version.h #16919
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kasper93
reviewed
Oct 11, 2025
al3xtjames
force-pushed
the
osxbundle-version.h
branch
3 times, most recently
from
2135b60 to
9fef0f0
Compare
|
Download the artifacts for this pull request: Windows |
Akemi
reviewed
Oct 12, 2025
TOOLS/osxbundle.py
Outdated
| def bundle_version(build_path, src_path): | ||
| version = "UNKNOWN" | ||
| version_h_path = os.path.join(build_path, "common", "version.h") | ||
| version_path = os.path.join(src_path, "MPV_VERSION") |
There was a problem hiding this comment.
since the version.h already incorporates the fallback to MPV_VERSION, we don't need this as another fallback here?
There was a problem hiding this comment.
It does seem redundant. Let me remove the MPV_VERSION fallback.
osxbundle.py currently reads the version number from MPV_VERSION, while Meson first tries git describe before falling back to MPV_VERSION. Update osxbundle.py to try reading the version number from version.h before falling back to MPV_VERSION. This ensures that the version number in the bundle matches the output of mpv --version.
al3xtjames
force-pushed
the
osxbundle-version.h
branch
from
9fef0f0 to
98cb27b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
osxbundle.py currently reads the version number from MPV_VERSION, while Meson first tries git describe before falling back to MPV_VERSION. Update osxbundle.py to try reading the version number from version.h before falling back to MPV_VERSION. This ensures that the version number in the bundle matches the output of mpv --version.