diff options
| author | Salamandar <felix@piedallu.me> | 2018-05-31 10:14:13 +0200 |
|---|---|---|
| committer | Salamandar <felix@piedallu.me> | 2018-06-01 14:23:24 +0200 |
| commit | dd91f96867831f1025f9b3e70314355815862f96 (patch) | |
| tree | 7f8b42fb7ba0a298f5d340f8725b6004af0c17e9 | |
| parent | b9c37e4fd2aa786e3a9b148d21854b75622c229f (diff) | |
| download | meson-dd91f96867831f1025f9b3e70314355815862f96.zip meson-dd91f96867831f1025f9b3e70314355815862f96.tar.gz meson-dd91f96867831f1025f9b3e70314355815862f96.tar.bz2 | |
Move target_version from coredata to mesonlib
| -rw-r--r-- | mesonbuild/coredata.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreterbase.py | 5 | ||||
| -rw-r--r-- | mesonbuild/mesonlib.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 6540455..f3313f3 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -23,7 +23,6 @@ import ast import argparse version = '0.47.0.dev1' -target_version = '' backendlist = ['ninja', 'vs', 'vs2010', 'vs2015', 'vs2017', 'xcode'] default_yielding = False diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 46f1803..0da66af 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2286,7 +2286,7 @@ to directly access options of other subprojects.''') if 'meson_version' in kwargs: cv = coredata.version pv = kwargs['meson_version'] - coredata.target_version = pv + mesonlib.target_version = pv if not mesonlib.version_compare(cv, pv): raise InterpreterException('Meson version is %s but project requires %s.' % (cv, pv)) self.build.projects[self.subproject] = proj_name diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 8ae0489..649476d 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -17,7 +17,6 @@ from . import mparser, mesonlib, mlog from . import environment, dependencies -from . import coredata import os, copy, re, types from functools import wraps @@ -147,7 +146,7 @@ class FeatureNew: def use(self): self.add_called_feature() - tv = coredata.target_version + tv = mesonlib.target_version if tv == '': return if not mesonlib.version_compare_condition_with_min(tv, self.feature_version): @@ -185,7 +184,7 @@ class FeatureDeprecated: def use(self): self.add_called_feature() - tv = coredata.target_version + tv = mesonlib.target_version if tv == '': return if not mesonlib.version_compare_condition_with_max(tv, self.feature_version): diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index a2f05bc..fde7ed5 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -23,6 +23,8 @@ from mesonbuild import mlog have_fcntl = False have_msvcrt = False +# Used to report conflicts between meson_version and new features used +target_version = '' try: import fcntl |