diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-14 17:36:12 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-15 19:45:23 +0200 |
| commit | db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e (patch) | |
| tree | d94324a7da9d14f6cb8542938bcef23633413a50 /mesonbuild | |
| parent | b1087f011cb815a5214791ab92e7214e01b45b72 (diff) | |
| download | meson-db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e.zip meson-db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e.tar.gz meson-db8ad2a4bd4ed1e962e1cbfa76bd8abdf5e83b0e.tar.bz2 | |
Add test for build_on_all.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 9 | ||||
| -rw-r--r-- | mesonbuild/build.py | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index cace3b3..a051baf 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2163,13 +2163,10 @@ rule FORTRAN_DEP_HACK def get_build_on_all_targets(self): result = [] for t in self.build.get_targets().values(): - if t.build_on_all: + if t.build_on_all or \ + (hasattr(t, 'install') and t.install) or\ + (hasattr(t, 'build_always') and t.build_always): result.append(t) - # CustomTargets that aren't installed should only be built if - # they are used by something else or are to always be built - if isinstance(t, build.CustomTarget): - if t.install or t.build_always: - result.append(t) return result def generate_ending(self, outfile): diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 05595c3..555d0b9 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -44,6 +44,7 @@ known_basic_kwargs = {'install': True, 'sources': True, 'objects': True, 'native': True, + 'build_on_all': True, } # These contain kwargs supported by both static and shared libraries. These are @@ -264,6 +265,11 @@ class Target: def get_subdir(self): return self.subdir + def process_kwargs(self, kwargs): + if 'build_on_all' in kwargs: + self.build_on_all = kwargs['build_on_all'] + if not isinstance(self.build_on_all, bool): + raise InvalidArguments('build_on_all must be a boolean value.') class BuildTarget(Target): def __init__(self, name, subdir, subproject, is_cross, sources, objects, environment, kwargs): @@ -518,6 +524,7 @@ class BuildTarget(Target): return self.custom_install_dir def process_kwargs(self, kwargs, environment): + super().process_kwargs(kwargs) self.copy_kwargs(kwargs) kwargs.get('modules', []) self.need_install = kwargs.get('install', self.need_install) @@ -1281,6 +1288,7 @@ class CustomTarget(Target): return deps def process_kwargs(self, kwargs): + super().process_kwargs(kwargs) self.sources = kwargs.get('input', []) if not isinstance(self.sources, list): self.sources = [self.sources] |