diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2018-11-28 23:05:40 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-06 12:19:28 +0100 |
| commit | 24d668bea06b3b953855fa12ef2f5b417d4dd163 (patch) | |
| tree | c7b675d19f15a5fe45dc5ff1983f08e3938d1bef /mesonbuild/mintro.py | |
| parent | 4addd176dbf3eca01f5b3058e48f502c69268cbd (diff) | |
| download | meson-24d668bea06b3b953855fa12ef2f5b417d4dd163.zip meson-24d668bea06b3b953855fa12ef2f5b417d4dd163.tar.gz meson-24d668bea06b3b953855fa12ef2f5b417d4dd163.tar.bz2 | |
Removed determine_installed_path since it is no longer needed
Diffstat (limited to 'mesonbuild/mintro.py')
| -rw-r--r-- | mesonbuild/mintro.py | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 97a7c94..326cd6c 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -66,24 +66,6 @@ def add_arguments(parser): help='Always use the new JSON format for multiple entries (even for 0 and 1 introspection commands)') parser.add_argument('builddir', nargs='?', default='.', help='The build directory') -def determine_installed_path(target, installdata): - install_targets = [] - for i in target.outputs: - for j in installdata.targets: - if os.path.basename(j.fname) == i: # FIXME, might clash due to subprojects. - install_targets += [j] - break - if len(install_targets) == 0: - raise RuntimeError('Something weird happened. File a bug.') - - # Normalize the path by using os.path.sep consistently, etc. - # Does not change the effective path. - install_targets = list(map(lambda x: os.path.join(installdata.prefix, x.outdir, os.path.basename(x.fname)), install_targets)) - install_targets = list(map(lambda x: str(pathlib.PurePath(x)), install_targets)) - - return install_targets - - def list_installed(installdata): res = {} if installdata is not None: @@ -132,7 +114,7 @@ def list_targets(builddata: build.Build, installdata, backend: backends.Backend) for i in target.outputs: fname = intall_lookuptable.get(i) - if i is not None: + if fname is not None: t['install_filename'] += [fname] else: t['installed'] = False |