diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-27 22:00:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 22:00:58 +0300 |
| commit | 905dbd5cd2204621e4b8e422d8351538151f2e2c (patch) | |
| tree | af459aa9b44b6e1eedb001ad84cee486afcbbd35 | |
| parent | b5e30fd8e09182473f31d7865d6b8dc5823788cd (diff) | |
| parent | 543310fab123f072276aa7ae542a6b4964af69d7 (diff) | |
| download | meson-905dbd5cd2204621e4b8e422d8351538151f2e2c.zip meson-905dbd5cd2204621e4b8e422d8351538151f2e2c.tar.gz meson-905dbd5cd2204621e4b8e422d8351538151f2e2c.tar.bz2 | |
Merge pull request #1529 from centricular/fix-dep-typo
Fix dep typo + reduce appveyor tests
| -rw-r--r-- | .appveyor.yml | 18 | ||||
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 8f215c9..e4d2e60 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,24 +20,6 @@ environment: compiler: msvc2015 backend: vs2015 - - arch: x86 - compiler: msvc2017 - backend: ninja - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - - arch: x86 - compiler: msvc2017 - backend: vs2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - - arch: x64 - compiler: msvc2015 - backend: ninja - - - arch: x64 - compiler: msvc2015 - backend: vs2015 - - arch: x64 compiler: msvc2017 backend: ninja diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 5d3c095..cd5db62 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1835,8 +1835,8 @@ class Interpreter(InterpreterBase): self.validate_arguments(args, 1, [str]) name = args[0] if '<' in name or '>' in name or '=' in name: - raise InvalidArguments('''Characters <, > and = are forbidden in target names. To specify version -requirements use the version keyword argument instead.''') + raise InvalidArguments('Characters <, > and = are forbidden in dependency names. To specify' + 'version\n requirements use the \'version\' keyword argument instead.') identifier = dependencies.get_dep_identifier(name, kwargs) # Check if we want this as a cross-dep or a native-dep # FIXME: Not all dependencies support such a distinction right now, |