diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2018-11-28 22:47:53 +0100 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-06 12:19:28 +0100 |
commit | 4addd176dbf3eca01f5b3058e48f502c69268cbd (patch) | |
tree | 5a5bca6047e9cce196e65d880f54270cc30e539b /mesonbuild/mintro.py | |
parent | a5be893b19daf9e1f08eacc5d7f01389f6e40956 (diff) | |
download | meson-4addd176dbf3eca01f5b3058e48f502c69268cbd.zip meson-4addd176dbf3eca01f5b3058e48f502c69268cbd.tar.gz meson-4addd176dbf3eca01f5b3058e48f502c69268cbd.tar.bz2 |
Removed fallback detection logic
Diffstat (limited to 'mesonbuild/mintro.py')
-rw-r--r-- | mesonbuild/mintro.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 6768070..97a7c94 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -100,6 +100,13 @@ def list_installed(installdata): def list_targets(builddata: build.Build, installdata, backend: backends.Backend): tlist = [] + + # Fast lookup table for installation files + intall_lookuptable = {} + for i in installdata.targets: + outname = os.path.join(installdata.prefix, i.outdir, os.path.basename(i.fname)) + intall_lookuptable[os.path.basename(i.fname)] = str(pathlib.PurePath(outname)) + for (idname, target) in builddata.get_targets().items(): if not isinstance(target, build.Target): raise RuntimeError('Something weird happened. File a bug.') @@ -121,7 +128,12 @@ def list_targets(builddata: build.Build, installdata, backend: backends.Backend) if installdata and target.should_install(): t['installed'] = True - t['install_filename'] = determine_installed_path(target, installdata) + t['install_filename'] = [] + + for i in target.outputs: + fname = intall_lookuptable.get(i) + if i is not None: + t['install_filename'] += [fname] else: t['installed'] = False tlist.append(t) |