aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-03-28 22:03:39 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-04-02 00:07:23 +0300
commit553ac89e02c170b504c495e83164a7a9d15198f4 (patch)
tree680853d080c9842ff59a071032e0e4220a10c43a
parent319398f0749890a57a661ddb4524e93f86a0d41e (diff)
downloadmeson-553ac89e02c170b504c495e83164a7a9d15198f4.zip
meson-553ac89e02c170b504c495e83164a7a9d15198f4.tar.gz
meson-553ac89e02c170b504c495e83164a7a9d15198f4.tar.bz2
Review fixes.
-rw-r--r--mesonbuild/backend/backends.py2
-rw-r--r--mesonbuild/backend/ninjabackend.py2
-rw-r--r--mesonbuild/backend/vs2010backend.py2
-rw-r--r--mesonbuild/coredata.py3
4 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index e8cbe5d..5517fbd 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -83,7 +83,7 @@ class OptionProxy:
class OptionOverrideProxy:
'''Mimic an option list but transparently override
-selected option values.'''
+ selected option values.'''
def __init__(self, overrides, options):
self.overrides = overrides
self.options = options
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index d54cacf..bc51ace 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1890,8 +1890,6 @@ rule FORTRAN_DEP_HACK
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src))
if isinstance(src, RawFilename) and src.fname.endswith('.h'):
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src.fname))
- extra_orderdeps = []
- compiler = get_compiler_for_source(target.compilers.values(), src)
if isinstance(src, str) and src.endswith('.h'):
raise AssertionError('BUG: sources should not contain headers {!r}'.format(src))
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index cc44458..7afbc0d 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -6,7 +6,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writingget_, software
+# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index dce1d1d..58dfb97 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -16,6 +16,7 @@ import pickle, os, uuid
from pathlib import PurePath
from .mesonlib import MesonException, commonpath
from .mesonlib import default_libdir, default_libexecdir, default_prefix
+import ast
version = '0.40.0.dev1'
backendlist = ['ninja', 'vs', 'vs2010', 'vs2015', 'vs2017', 'xcode']
@@ -113,7 +114,7 @@ class UserStringArrayOption(UserOption):
if isinstance(value, str):
if not value.startswith('['):
raise MesonException('Valuestring does not define an array: ' + value)
- newvalue = eval(value, {}, {}) # Yes, it is unsafe.
+ newvalue = ast.literal_eval(value)
else:
newvalue = value
if not isinstance(newvalue, list):