From e17b5c635ebba0cf232bd14d142e757715f5fe4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Mon, 10 Jun 2024 21:00:33 +0200 Subject: [PATCH] VERSION: rename to MPV_VERSION to avoid standard library header conflict Root directory is added to include directories and `VERSION` conflicts with `#include ` which is standard library header. --- DOCS/release-policy.md | 4 ++-- VERSION => MPV_VERSION | 0 TOOLS/osxbundle.py | 2 +- meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename VERSION => MPV_VERSION (100%) diff --git a/DOCS/release-policy.md b/DOCS/release-policy.md index 23bc48befd..eb24172a2c 100644 --- a/DOCS/release-policy.md +++ b/DOCS/release-policy.md @@ -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) @@ -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** diff --git a/VERSION b/MPV_VERSION similarity index 100% rename from VERSION rename to MPV_VERSION diff --git a/TOOLS/osxbundle.py b/TOOLS/osxbundle.py index 0e156a0b02..f096c3856e 100755 --- a/TOOLS/osxbundle.py +++ b/TOOLS/osxbundle.py @@ -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() diff --git a/meson.build b/meson.build index bc6d79aef3..3da216db48 100644 --- a/meson.build +++ b/meson.build @@ -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',