diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2019-05-15 21:14:16 -0400 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@igalia.com> | 2019-05-15 23:23:46 -0400 |
| commit | 802e18519b7e02179ed69a3819eda779d3be211d (patch) | |
| tree | 51052f79ebeb6e47466d9b19fb2251b22cfaa545 | |
| parent | 54ce8e882bd5b945d0f2c25c1a583b43848bd150 (diff) | |
| download | gstreamer-802e18519b7e02179ed69a3819eda779d3be211d.tar.gz | |
Avoid making a dependency between plugins and the build.ninja file
Basically meson detects that we pass file paths to run_command to regenerate the build.ninja file when those change
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | scripts/generate_plugins_path.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/meson.build b/meson.build index ca7826cfdf..632ee13fbf 100644 --- a/meson.build +++ b/meson.build @@ -64,10 +64,12 @@ if build_system == 'windows' subproject('win-nasm') endif +pathsep = host_machine.system() == 'windows' ? ';' : ':' + subproject('orc', required: get_option('orc')) subprojects_names = [] -all_plugins = [] +all_plugins = '' foreach sp : subprojects project_name = sp[0] build_infos = sp[1] @@ -82,7 +84,7 @@ foreach sp : subprojects if subproj.found() and build_infos.has_key('build-hotdoc', default: false) foreach plugin: subproj.get_variable('plugins') - all_plugins += plugin.full_path() + all_plugins += pathsep + plugin.full_path() endforeach if documented_projects != '' documented_projects += ',' diff --git a/scripts/generate_plugins_path.py b/scripts/generate_plugins_path.py index 89288244c3..d57c60c2fe 100644 --- a/scripts/generate_plugins_path.py +++ b/scripts/generate_plugins_path.py @@ -7,12 +7,12 @@ import json if __name__ == "__main__": parser = argparse.ArgumentParser() 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() all_paths = set() - for plugin in options.plugins: + for plugin in options.plugins.split(os.pathsep): all_paths.add(os.path.dirname(plugin)) with open(os.path.join(options.builddir, 'GstPluginsPath.json'), "w") as f: |