diff options
| -rw-r--r-- | mesonbuild/mintro.py | 20 | ||||
| -rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 2 insertions, 20 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 diff --git a/run_unittests.py b/run_unittests.py index 9088a86..9120a43 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1221,7 +1221,7 @@ class BasePlatformTests(unittest.TestCase): self.assertEqual(PurePath(path1), PurePath(path2)) def assertPathListEqual(self, pathlist1, pathlist2): - self.assertEquals(len(pathlist1), len(pathlist2)) + self.assertEqual(len(pathlist1), len(pathlist2)) worklist = list(zip(pathlist1, pathlist2)) for i in worklist: self.assertPathEqual(i[0], i[1]) |