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>

diff --git a/gst-env.py b/gst-env.py
index b43598aac3988ecd0f0492afc8ff09d610c9ddab..384acb8d5d05ac3a13b375c3e465bac06037a951 100755 (executable)
--- 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" %

diff --git a/meson.build b/meson.build
index 53bdcf56f1e5f881380de56011e7f2886d4571dd..e5cf0e0c3b8a63cf5e99bad9c9beecf1d93c14db 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -380,9 +380,9 @@ endif
 message('Building subprojects: ' + ', '.join(subprojects_names))
 
 setenv = find_program('gst-env.py')
-devenv_cmd = [setenv, '--builddir=@0@'.format(meson.project_build_root()),
-              '--gstbuilddir=@0@'.format(meson.current_build_dir()),
-              '--srcdir=@0@'.format(meson.project_source_root())]
+
+devenv_cmd = [setenv, '--builddir=@0@'.format(meson.build_root()),
+              '--srcdir=@0@'.format(meson.source_root())]
 
 subdir('tests')
 if meson.can_run_host_binaries() and build_machine.system() == 'linux' and host_machine.system() == 'windows'