mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "Allow running gst-uninstalled when gst-build is a subproject"

Browse source 
This reverts commit 879126a31c.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1743>
This commit is contained in:
Sebastian Fricke 2022-02-17 21:41:40 +01:00 committed by GStreamer Marge Bot
parent c999d2c3a9
commit 0c8ff1a837
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-env.py
View file

@ -390,7 +390,7 @@ def get_subprocess_env(options, gst_version):
os.path.join(options.builddir, root), os.path.join(options.builddir, root),
options.sysroot) 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): for plugin_path in json.load(f):
prepend_env_var(env, 'GST_PLUGIN_PATH', plugin_path, prepend_env_var(env, 'GST_PLUGIN_PATH', plugin_path,
options.sysroot) options.sysroot)
@ -501,9 +501,6 @@ if __name__ == "__main__":
parser.add_argument("--builddir", parser.add_argument("--builddir",
default=DEFAULT_BUILDDIR, default=DEFAULT_BUILDDIR,
help="The meson build directory") help="The meson build directory")
parser.add_argument("--gstbuilddir",
default=None,
help="The meson GStreamer build directory (defaults to builddir)")
parser.add_argument("--srcdir", parser.add_argument("--srcdir",
default=SCRIPTDIR, default=SCRIPTDIR,
help="The top level source directory") 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" % print("GStreamer not built in %s\n\nBuild it and try again" %
options.builddir) options.builddir)
exit(1) 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.builddir = os.path.abspath(options.builddir)
options.gstbuilddir = os.path.abspath(options.gstbuilddir)
if not os.path.exists(options.srcdir): if not os.path.exists(options.srcdir):
print("The specified source dir does not exist" % print("The specified source dir does not exist" %

6
meson.build
View file

@ -380,9 +380,9 @@ endif
message('Building subprojects: ' + ', '.join(subprojects_names)) message('Building subprojects: ' + ', '.join(subprojects_names))
setenv = find_program('gst-env.py') setenv = find_program('gst-env.py')
devenv_cmd = [setenv, '--builddir=@0@'.format(meson.project_build_root()),
'--gstbuilddir=@0@'.format(meson.current_build_dir()), devenv_cmd = [setenv, '--builddir=@0@'.format(meson.build_root()),
'--srcdir=@0@'.format(meson.project_source_root())] '--srcdir=@0@'.format(meson.source_root())]
subdir('tests') subdir('tests')
if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows' if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows'