Root directory is added to include directories and `VERSION` conflicts with `#include <version>` which is standard library header.
Unified · Split
| @@ -24,7 +24,7 @@ While on master: · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | - Update the `RELEASE_NOTES` file, replacing the previous release notes. | 25 | - Update the `RELEASE_NOTES` file, replacing the previous release notes. |
| 26 | 26 | ||
| 27 | - Update the `VERSION` file. | 27 | - Update the `MPV_VERSION` file. |
| 28 | 28 | ||
| 29 | - Update `DOCS/client-api-changes.rst` (in particular, update the last version | 29 | - Update `DOCS/client-api-changes.rst` (in particular, update the last version |
| 30 | number if necessary) | 30 | number if necessary) |
| @@ -43,7 +43,7 @@ While on master: · 12 unmodified lines | |||
| 43 | - Create a new GitHub release using the content of `RELEASE_NOTES` related to | 43 | - Create a new GitHub release using the content of `RELEASE_NOTES` related to |
| 44 | the new version. | 44 | the new version. |
| 45 | 45 | ||
| 46 | - Readd -UNKNOWN suffix to version in `VERSION` file. | 46 | - Readd -UNKNOWN suffix to version in `MPV_VERSION` file. |
| 47 | 47 | ||
| 48 | If necessary (to e.g. exclude commits already on master), the release can | 48 | If necessary (to e.g. exclude commits already on master), the release can |
| 49 | be done on a branch with different commit history. The release branch **must** | 49 | be done on a branch with different commit history. The release branch **must** |
File renamed without changes.
| @@ -47,7 +47,7 @@ def sign_bundle(binary_name): · 46 unmodified lines | |||
| 47 | 47 | ||
| 48 | def bundle_version(src_path): | 48 | def bundle_version(src_path): |
| 49 | version = 'UNKNOWN' | 49 | version = 'UNKNOWN' |
| 50 | version_path = os.path.join(src_path, 'VERSION') | 50 | version_path = os.path.join(src_path, 'MPV_VERSION') |
| 51 | if os.path.exists(version_path): | 51 | if os.path.exists(version_path): |
| 52 | x = open(version_path) | 52 | x = open(version_path) |
| 53 | version = x.read() | 53 | version = x.read() |
| @@ -1,7 +1,7 @@ | |||
| 1 | project('mpv', | 1 | project('mpv', |
| 2 | 'c', | 2 | 'c', |
| 3 | license: ['GPL2+', 'LGPL2.1+'], | 3 | license: ['GPL2+', 'LGPL2.1+'], |
| 4 | version: files('./VERSION'), | 4 | version: files('./MPV_VERSION'), |
| 5 | meson_version: '>=0.62.0', | 5 | meson_version: '>=0.62.0', |
| 6 | default_options: [ | 6 | default_options: [ |
| 7 | 'backend_max_links=16', | 7 | 'backend_max_links=16', |