From 1ff0fccc295f5f656f4bf8524bd58cfff70ac2b1 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 27 Mar 2017 18:35:24 +0530 Subject: Fix typo in dependency invalid arguments error --- mesonbuild/interpreter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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, -- cgit v1.1 From 543310fab123f072276aa7ae542a6b4964af69d7 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 27 Mar 2017 18:37:06 +0530 Subject: appveyor: Only build vs2010/x86 + vs2015/x86 + vs2017/x64 This reduces our CI running time by roughly half without compromising much test coverage by much. We can mostly safely assume that very few Meson bugs will be arch-specific with Visual Studio. --- .appveyor.yml | 18 ------------------ 1 file changed, 18 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 -- cgit v1.1