From 3e9533d9b88d75d99632fa40e38cfed842d10842 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 1 Nov 2017 11:54:10 -0700 Subject: [PATCH] meson: Add script to use VERSION file for getting version Meson has up until this point set it's version in the root meson.build script, while the other build systems read the VERSION file. This is just "one more thing" to duplicate between meson and every other build system. This script is a simple "read, strip, print" sort of deal to allow meson to read the VERSION file. I chose to implement this in python since python is portable, and to keep the meson.build script clean. This is also complicated by the fact that the project() call *must* be the first non-comment,non-blank in the toplevel meson.build script. v2: - Move from scripts/ to bin/ - use python explicitly to run the scripts to support windows Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- bin/meson_get_version.py | 35 +++++++++++++++++++++++++++++++++++ meson.build | 4 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 bin/meson_get_version.py diff --git a/bin/meson_get_version.py b/bin/meson_get_version.py new file mode 100644 index 00000000000..a221e26f250 --- /dev/null +++ b/bin/meson_get_version.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python +# encoding=utf-8 +# Copyright © 2017 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +from __future__ import print_function +import os + + +def main(): + filename = os.path.join(os.environ['MESON_SOURCE_ROOT'], 'VERSION') + with open(filename) as f: + version = f.read().strip() + print(version, end='') + + +if __name__ == '__main__': + main() diff --git a/meson.build b/meson.build index ddd76804c54..51d19c02b80 100644 --- a/meson.build +++ b/meson.build @@ -21,7 +21,9 @@ project( 'mesa', ['c', 'cpp'], - version : '17.3.0-devel', + version : run_command( + [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] + ).stdout(), license : 'MIT', meson_version : '>= 0.42', default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] -- 2.30.2