mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 05:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Avoid making a dependency between plugins and the build.ninja file

Browse source 
Basically meson detects that we pass file paths to run_command to regenerate the build.ninja file when those change
This commit is contained in:
Thibault Saunier 2019-05-15 21:14:16 -04:00
parent 54ce8e882b
commit 802e18519b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -64,10 +64,12 @@ if build_system == 'windows'
subproject('win-nasm') subproject('win-nasm')
endif endif
pathsep = host_machine.system() == 'windows' ? ';' : ':'
subproject('orc', required: get_option('orc')) subproject('orc', required: get_option('orc'))
subprojects_names = [] subprojects_names = []
all_plugins = [] all_plugins = ''
foreach sp : subprojects foreach sp : subprojects
project_name = sp[0] project_name = sp[0]
build_infos = sp[1] build_infos = sp[1]
@ -82,7 +84,7 @@ foreach sp : subprojects
if subproj.found() and build_infos.has_key('build-hotdoc', default: false) if subproj.found() and build_infos.has_key('build-hotdoc', default: false)
foreach plugin: subproj.get_variable('plugins') foreach plugin: subproj.get_variable('plugins')
all_plugins += plugin.full_path() all_plugins += pathsep + plugin.full_path()
endforeach endforeach
if documented_projects != '' if documented_projects != ''
documented_projects += ',' documented_projects += ','

4
scripts/generate_plugins_path.py
View file

@ -7,12 +7,12 @@ import json
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--builddir", help="The meson build directory") parser.add_argument("--builddir", help="The meson build directory")
parser.add_argument(dest="plugins", help="The list of plugins", nargs="+") parser.add_argument(dest="plugins", help="The list of plugins")
options = parser.parse_args() options = parser.parse_args()
all_paths = set() all_paths = set()
for plugin in options.plugins: for plugin in options.plugins.split(os.pathsep):
all_paths.add(os.path.dirname(plugin)) all_paths.add(os.path.dirname(plugin))
with open(os.path.join(options.builddir, 'GstPluginsPath.json'), "w") as f: with open(os.path.join(options.builddir, 'GstPluginsPath.json'), "w") as f: