diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-02-15 16:00:12 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-22 23:03:55 +0200 |
| commit | 2fabd4c7dc22373e99fc63823d80083ad30704b8 (patch) | |
| tree | e2c9bf7d46812ee4e62e0289ea8cf3b6dc1801f6 /mesonbuild/mintro.py | |
| parent | 36d9d7a96f6f42386b9dc3a18c152ccd4c8ca37b (diff) | |
| download | meson-2fabd4c7dc22373e99fc63823d80083ad30704b8.zip meson-2fabd4c7dc22373e99fc63823d80083ad30704b8.tar.gz meson-2fabd4c7dc22373e99fc63823d80083ad30704b8.tar.bz2 | |
minstall: Add --skip-subprojects option
By default all subprojects are installed. If --skip-subprojects is given
with no value only the main project is installed. If --skip-subprojects
is given with a value, it should be a coma separated list of subprojects
to skip and all others will be installed.
Fixes: #2550.
Diffstat (limited to 'mesonbuild/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 52f4ac0..5516294 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -110,14 +110,14 @@ def list_installed(installdata: backends.InstallData) -> T.Dict[str, str]: for alias in t.aliases.keys(): res[os.path.join(installdata.build_dir, alias)] = \ os.path.join(installdata.prefix, t.outdir, os.path.basename(alias)) - for path, installpath, _ in installdata.data: - res[path] = os.path.join(installdata.prefix, installpath) - for path, installdir, _ in installdata.headers: - res[path] = os.path.join(installdata.prefix, installdir, os.path.basename(path)) - for path, installpath, _ in installdata.man: - res[path] = os.path.join(installdata.prefix, installpath) - for path, installpath, _, _ in installdata.install_subdirs: - res[path] = os.path.join(installdata.prefix, installpath) + for i in installdata.data: + res[i.path] = os.path.join(installdata.prefix, i.install_path) + for i in installdata.headers: + res[i.path] = os.path.join(installdata.prefix, i.install_path, os.path.basename(i.path)) + for i in installdata.man: + res[i.path] = os.path.join(installdata.prefix, i.install_path) + for i in installdata.install_subdirs: + res[i.path] = os.path.join(installdata.prefix, i.install_path) return res def list_targets_from_source(intr: IntrospectionInterpreter) -> T.List[T.Dict[str, T.Union[bool, str, T.List[T.Union[str, T.Dict[str, T.Union[str, T.List[str], bool]]]]]]]: |