Skip to content

Commit

Permalink
VERSION: rename to MPV_VERSION to avoid standard library header conflict
Browse files Browse the repository at this point in the history
Root directory is added to include directories and `VERSION` conflicts
with `#include <version>` which is standard library header.
  • Loading branch information
kasper93 committed Jun 10, 2024
1 parent db786f7 commit 6a4b173
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DOCS/release-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ While on master:

- Update the `RELEASE_NOTES` file, replacing the previous release notes.

- Update the `VERSION` file.
- Update the `MPV_VERSION` file.

- Update `DOCS/client-api-changes.rst` (in particular, update the last version
number if necessary)
Expand All @@ -43,7 +43,7 @@ While on master:
- Create a new GitHub release using the content of `RELEASE_NOTES` related to
the new version.

- Readd -UNKNOWN suffix to version in `VERSION` file.
- Readd -UNKNOWN suffix to version in `MPV_VERSION` file.

If necessary (to e.g. exclude commits already on master), the release can
be done on a branch with different commit history. The release branch **must**
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion TOOLS/osxbundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def sign_bundle(binary_name):

def bundle_version(src_path):
version = 'UNKNOWN'
version_path = os.path.join(src_path, 'VERSION')
version_path = os.path.join(src_path, 'MPV_VERSION')
if os.path.exists(version_path):
x = open(version_path)
version = x.read()
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('mpv',
'c',
license: ['GPL2+', 'LGPL2.1+'],
version: files('./VERSION'),
version: files('./MPV_VERSION'),
meson_version: '>=0.62.0',
default_options: [
'backend_max_links=16',
Expand Down

0 comments on commit 6a4b173

Please sign in to comment.