aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-04-06 23:10:20 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-04-06 23:10:20 +0300
commitcab5ce4fc0eeee6024632cfb3815a7b6e3b70885 (patch)
tree70ce279332b2c3730204ffa7dc2e9b01059c5921 /mesonbuild/build.py
parent5d53c6b7415b62f2172129a61770cf38aa3f3c1d (diff)
parent3f3fcace3d91da7d2643354e06a4b8d3c7143f86 (diff)
downloadmeson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.zip
meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.gz
meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.bz2
Merge pull request #438 from trhd/testing_options
New options for controlling test output.
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 2a91aa3..63cdcf3 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -17,7 +17,7 @@ from . import environment
from . import dependencies
from . import mlog
import copy, os
-from .mesonlib import File, flatten
+from .mesonlib import File, flatten, MesonException
known_basic_kwargs = {'install' : True,
'c_pch' : True,
@@ -71,7 +71,7 @@ We are fully aware that these are not really usable or pleasant ways to do
this but it's the best we can do given the way shell quoting works.
'''
-class InvalidArguments(coredata.MesonException):
+class InvalidArguments(MesonException):
pass
class Build:
@@ -299,10 +299,10 @@ class BuildTarget():
srclist = [srclist]
for src in srclist:
if not isinstance(src, str):
- raise coredata.MesonException('Extraction arguments must be strings.')
+ raise MesonException('Extraction arguments must be strings.')
src = File(False, self.subdir, src)
if src not in self.sources:
- raise coredata.MesonException('Tried to extract unknown source %s.' % src)
+ raise MesonException('Tried to extract unknown source %s.' % src)
obj_src.append(src)
return ExtractedObjects(self, obj_src)