mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-21 05:26:23 +00:00
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>
This commit is contained in:
parent
84bd496035
commit
beeec59a01
1 changed files with 2 additions and 4 deletions
|
@ -80,8 +80,6 @@ def is_library_target_and_not_plugin(target, filename):
|
||||||
'''
|
'''
|
||||||
if not target['type'].startswith('shared'):
|
if not target['type'].startswith('shared'):
|
||||||
return False
|
return False
|
||||||
if not target['installed']:
|
|
||||||
return False
|
|
||||||
# Check if this output of that target is a shared library
|
# Check if this output of that target is a shared library
|
||||||
if not SHAREDLIB_REG.search(filename):
|
if not SHAREDLIB_REG.search(filename):
|
||||||
return False
|
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):
|
def is_binary_target_and_in_path(target, filename, bindir):
|
||||||
if target['type'] != 'executable':
|
if target['type'] != 'executable':
|
||||||
return False
|
return False
|
||||||
if not target['installed']:
|
|
||||||
return False
|
|
||||||
# Check if this file installed by this target is installed to bindir
|
# Check if this file installed by this target is installed to bindir
|
||||||
for install_filename in listify(target['install_filename']):
|
for install_filename in listify(target['install_filename']):
|
||||||
if install_filename.endswith(os.path.basename(filename)):
|
if install_filename.endswith(os.path.basename(filename)):
|
||||||
|
@ -282,6 +278,8 @@ def get_subprocess_env(options, gst_version):
|
||||||
|
|
||||||
for target in targets:
|
for target in targets:
|
||||||
filenames = listify(target['filename'])
|
filenames = listify(target['filename'])
|
||||||
|
if not target['installed']:
|
||||||
|
continue
|
||||||
for filename in filenames:
|
for filename in filenames:
|
||||||
root = os.path.dirname(filename)
|
root = os.path.dirname(filename)
|
||||||
if srcdir_path / "subprojects/gst-devtools/validate/plugins" in (srcdir_path / root).parents:
|
if srcdir_path / "subprojects/gst-devtools/validate/plugins" in (srcdir_path / root).parents:
|
||||||
|
|
Loading…
Reference in a new issue