diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-04 09:06:00 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2017-05-05 08:11:28 +1000 |
| commit | 7a3be163cbceb9f569ff454dc23fdfecadc166cc (patch) | |
| tree | be20093056b7bdfc46c71a4de59f7b6d3902b730 /docs/markdown | |
| parent | 44131226761913bba297a0cf5d20d37d9408d02e (diff) | |
| download | meson-7a3be163cbceb9f569ff454dc23fdfecadc166cc.zip meson-7a3be163cbceb9f569ff454dc23fdfecadc166cc.tar.gz meson-7a3be163cbceb9f569ff454dc23fdfecadc166cc.tar.bz2 | |
Default to project_version() in vcs_tag fallback
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Reference-manual.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Release-notes-for-0.41.0.md | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 66027c2..9c4df7e 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -639,7 +639,7 @@ This command detects revision control commit information at build time and place - `input` file to modify (e.g. `version.c.in`) (required) - `output` file to write the results to (e.g. `version.c`) (required) -- `fallback` version number to use when no revision control information is present, such as when building from a release tarball (required) +- `fallback` version number to use when no revision control information is present, such as when building from a release tarball (defaults to `meson.project_version()`) - `command` string list with the command to execute, see [`custom_target`](#custom_target) for details on how this command must be specified - `replace_string` string in the input file to substitute with the commit information (defaults to `@VCS_TAG@`) diff --git a/docs/markdown/Release-notes-for-0.41.0.md b/docs/markdown/Release-notes-for-0.41.0.md index 6e00ecd..9c02cdc 100644 --- a/docs/markdown/Release-notes-for-0.41.0.md +++ b/docs/markdown/Release-notes-for-0.41.0.md @@ -12,3 +12,8 @@ Add features here as code is merged to master. ## Dependency Handler for LLVM Native support for linking against LLVM using the `dependency` function. + +## vcs_tag keyword fallback is is now optional + +The `fallback` keyword in `vcs_tag` is now optional. If not given, its value +defaults to the return value of `meson.project_version()`. |