diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-23 16:05:06 +0530 |
---|---|---|
committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-08-03 18:52:20 +0000 |
commit | beeec59a0112f4c28eca477b8f5944314fe98aea (patch) | |
tree | a471067d1e700f48862dd24a2540adfb2f1c1123 | |
parent | 84bd4960354a66beb726a3c8ae873bf91a79ac3c (diff) |
gst-env: Prematurely skip all targets that aren't installed
Simplifies the code a bit.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-build/-/merge_requests/180>
-rwxr-xr-x | gst-env.py | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -80,8 +80,6 @@ def is_library_target_and_not_plugin(target, filename): ''' if not target['type'].startswith('shared'): return False - if not target['installed']: - return False # Check if this output of that target is a shared library if not SHAREDLIB_REG.search(filename): return False @@ -104,8 +102,6 @@ def is_library_target_and_not_plugin(target, filename): def is_binary_target_and_in_path(target, filename, bindir): if target['type'] != 'executable': return False - if not target['installed']: - return False # Check if this file installed by this target is installed to bindir for install_filename in listify(target['install_filename']): if install_filename.endswith(os.path.basename(filename)): @@ -282,6 +278,8 @@ def get_subprocess_env(options, gst_version): for target in targets: filenames = listify(target['filename']) + if not target['installed']: + continue for filename in filenames: root = os.path.dirname(filename) if srcdir_path / "subprojects/gst-devtools/validate/plugins" in (srcdir_path / root).parents: |