aboutsummaryrefslogtreecommitdiff
path: root/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-10-03 23:18:40 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-10-03 23:18:40 +0300
commita9ec9ba104b78f657482846b84dae39385ab08de (patch)
tree15cbc2a15f6077f448bea5f21eacbd6d54291d3e /build.py
parent7bb28ef3c87f4f19daf83f4f564d9e3338eff10a (diff)
downloadmeson-a9ec9ba104b78f657482846b84dae39385ab08de.zip
meson-a9ec9ba104b78f657482846b84dae39385ab08de.tar.gz
meson-a9ec9ba104b78f657482846b84dae39385ab08de.tar.bz2
Basic outline for exposing private dir. Not working fully yet.
Diffstat (limited to 'build.py')
-rw-r--r--build.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/build.py b/build.py
index e838b67..6d263f1 100644
--- a/build.py
+++ b/build.py
@@ -124,11 +124,15 @@ class Build:
return self.global_args.get(compiler.get_language(), [])
class IncludeDirs():
- def __init__(self, curdir, dirs):
+ def __init__(self, curdir, dirs, extra_build_dirs=None):
self.curdir = curdir
self.incdirs = dirs
# Interpreter has validated that all given directories
# actually exist.
+ if extra_build_dirs is None:
+ self.extra_build_dirs = []
+ else:
+ self.extra_build_dirs = extra_build_dirs
def get_curdir(self):
return self.curdir
@@ -136,6 +140,9 @@ class IncludeDirs():
def get_incdirs(self):
return self.incdirs
+ def get_extra_build_dirs(self):
+ return self.extra_build_dirs
+
class ExtractedObjects():
def __init__(self, target, srclist):
self.target = target
@@ -545,7 +552,7 @@ class Generator():
if not isinstance(rule, str):
raise InvalidArguments('"output" may only contain strings.')
if not '@BASENAME@' in rule and not '@PLAINNAME@' in rule:
- raise InvalidArguments('"outputs" must contain @BASENAME@ or @PLAINNAME@.')
+ raise InvalidArguments('Every element of "output" must contain @BASENAME@ or @PLAINNAME@.')
if '/' in rule or '\\' in rule:
raise InvalidArguments('"outputs" must not contain a directory separator.')
if len(outputs) > 1: