diff options
author | Sebastian Fricke <sebastian.fricke@collabora.com> | 2022-02-17 21:41:40 +0100 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-03-01 11:33:10 +0000 |
commit | 0c8ff1a8372518ef45b4b26e411d4f38b9b7e886 (patch) | |
tree | 28720de8b9d883269bd04d6f5230b0c9e13dbdd1 /gst-env.py | |
parent | c999d2c3a904ddadda055b8f4a3654856c80b938 (diff) | |
download | gstreamer-0c8ff1a8372518ef45b4b26e411d4f38b9b7e886.tar.gz |
Revert "Allow running gst-uninstalled when gst-build is a subproject"
This reverts commit 879126a31c77622f594e70f205fcefd4556d9865.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1743>
Diffstat (limited to 'gst-env.py')
-rwxr-xr-x | gst-env.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gst-env.py b/gst-env.py index b43598aac3..384acb8d5d 100755 --- a/gst-env.py +++ b/gst-env.py @@ -390,7 +390,7 @@ def get_subprocess_env(options, gst_version): os.path.join(options.builddir, root), options.sysroot) - with open(os.path.join(options.gstbuilddir, 'GstPluginsPath.json')) as f: + with open(os.path.join(options.builddir, 'GstPluginsPath.json')) as f: for plugin_path in json.load(f): prepend_env_var(env, 'GST_PLUGIN_PATH', plugin_path, options.sysroot) @@ -501,9 +501,6 @@ if __name__ == "__main__": parser.add_argument("--builddir", default=DEFAULT_BUILDDIR, help="The meson build directory") - parser.add_argument("--gstbuilddir", - default=None, - help="The meson GStreamer build directory (defaults to builddir)") parser.add_argument("--srcdir", default=SCRIPTDIR, help="The top level source directory") @@ -526,16 +523,7 @@ if __name__ == "__main__": print("GStreamer not built in %s\n\nBuild it and try again" % options.builddir) exit(1) - - if options.gstbuilddir and not os.path.exists(options.gstbuilddir): - print("GStreamer is not built in %s\n\nBuild it and try again" % - options.gstbuilddir) - exit(1) - elif not options.gstbuilddir: - options.gstbuilddir = options.builddir - options.builddir = os.path.abspath(options.builddir) - options.gstbuilddir = os.path.abspath(options.gstbuilddir) if not os.path.exists(options.srcdir): print("The specified source dir does not exist" % |