From: Mathieu Duponchelle <mathieu@centricular.com>
Date: Sun, 28 Oct 2018 13:15:31 +0000 (+0100)
Subject: uninstalled: remove setup_python_env
X-Git-Tag: 1.19.3~481^2~285
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5feafc66cee7d839dd088c0961d013ef5a25d6ee;p=platform%2Fupstream%2Fgstreamer.git

uninstalled: remove setup_python_env

We now use a different approach to setting up our
uninstalled python environment:

We add the gst-python folder to PYTHONPATH, and it no
longer contains __init__.py files. This means that
import gi.overrides correctly loads pygobject's __init__
module, but import gi.overrides.Gst also works, as __init__
files are no longer required by python.
---

diff --git a/gst-uninstalled.py b/gst-uninstalled.py
index 4871a7d..4fc58f4 100755
--- a/gst-uninstalled.py
+++ b/gst-uninstalled.py
@@ -75,7 +75,6 @@ def get_subprocess_env(options, gst_version):
     prepend_env_var(env, "GI_TYPELIB_PATH", os.path.join(PREFIX_DIR, 'lib',
                                                          'lib', 'girepository-1.0'))
     prepend_env_var(env, "PKG_CONFIG_PATH", os.path.join(PREFIX_DIR, 'lib', 'pkgconfig'))
-    setup_python_env(options, env)
 
     meson = get_meson()
     targets_s = subprocess.check_output(meson + ['introspect', options.builddir, '--targets'])
@@ -175,44 +174,6 @@ def in_venv():
     return (hasattr(sys, 'real_prefix') or
             (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix))
 
-def setup_python_env(options, env):
-    some_overrides_built = False
-    for override_path in [os.path.join("subprojects", "gst-editing-services", "bindings", "python", "gi", "overrides"),
-                          os.path.join("subprojects", "gst-python", "gi", "overrides")]:
-        if os.path.exists(os.path.join(SCRIPTDIR, override_path)):
-            some_overrides_built = True
-        else:
-            continue
-
-        prepend_env_var(env, "PYGOBJECT_OVERRIDES_PATH", os.path.join(SCRIPTDIR, override_path))
-        prepend_env_var(env, "PYGOBJECT_OVERRIDES_PATH", os.path.join(options.builddir, override_path))
-
-    if not some_overrides_built:
-        return
-
-    if in_venv ():
-        sitepackages = get_python_lib()
-    else:
-        sitepackages = site.getusersitepackages()
-
-    usercustomize = os.path.join(
-        subprocess.check_output([sys.executable, '-c', 'import site; print(site.USER_SITE)'],
-        env={"PYTHONUSERBASE": PREFIX_DIR}).decode().strip("\n"), "usercustomize.py")
-
-    custom_user_sitepackage = os.path.dirname(usercustomize)
-    os.makedirs(custom_user_sitepackage, exist_ok=True)
-    with open(usercustomize, "w") as f:
-         f.write("""import os
-import gi.overrides
-
-for override_path in os.environ.get("PYGOBJECT_OVERRIDES_PATH", "").split(os.pathsep):
-    gi.overrides.__path__.insert(0, override_path)
-""")
-
-    env["PYTHONUSERBASE"] = PREFIX_DIR
-    if sitepackages:
-        prepend_env_var(env, "PYTHONPATH", sitepackages)
-
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(prog="gstreamer-uninstalled")