Merge pull request #1529 from centricular/fix-dep-typo

Fix dep typo + reduce appveyor tests
pull/1530/head
Jussi Pakkanen 8 years ago committed by GitHub
commit 905dbd5cd2
  1. 18
      .appveyor.yml
  2. 4
      mesonbuild/interpreter.py

@ -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

@ -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,

Loading…
Cancel
Save