History

VERSION: rename to MPV_VERSION to avoid standard library header conflict

Root directory is added to include directories and `VERSION` conflicts with `#include <version>` which is standard library header.

Kacper Michajłow committed 2 years ago

Commit e17b5c61 parent 2ad65664 files · +4 −4Browse files

Unified · Split

4 files
  1. DOCS/release-policy.md +2 −2
  2. MPV_VERSION +0 −0
  3. TOOLS/osxbundle.py +1 −1
  4. meson.build +1 −1
DOCS/release-policy.md+2−2
@@ -24,7 +24,7 @@ While on master: · 23 unmodified lines
2424
2525 - Update the `RELEASE_NOTES` file, replacing the previous release notes.
2626
27−- Update the `VERSION` file.
27+- Update the `MPV_VERSION` file.
2828
2929 - Update `DOCS/client-api-changes.rst` (in particular, update the last version
3030 number if necessary)
@@ -43,7 +43,7 @@ While on master: · 12 unmodified lines
4343 - Create a new GitHub release using the content of `RELEASE_NOTES` related to
4444 the new version.
4545
46−- Readd -UNKNOWN suffix to version in `VERSION` file.
46+- Readd -UNKNOWN suffix to version in `MPV_VERSION` file.
4747
4848 If necessary (to e.g. exclude commits already on master), the release can
4949 be done on a branch with different commit history. The release branch **must**
MPV_VERSIONrenamed from VERSION+0−0

File renamed without changes.

TOOLS/osxbundle.py+1−1
@@ -47,7 +47,7 @@ def sign_bundle(binary_name): · 46 unmodified lines
4747
4848 def bundle_version(src_path):
4949 version = 'UNKNOWN'
50− version_path = os.path.join(src_path, 'VERSION')
50+ version_path = os.path.join(src_path, 'MPV_VERSION')
5151 if os.path.exists(version_path):
5252 x = open(version_path)
5353 version = x.read()
meson.build+1−1
@@ -1,7 +1,7 @@
11 project('mpv',
22 'c',
33 license: ['GPL2+', 'LGPL2.1+'],
4− version: files('./VERSION'),
4+ version: files('./MPV_VERSION'),
55 meson_version: '>=0.62.0',
66 default_options: [
77 'backend_max_links=16',

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t