From bcd3ffa8b2a259aa7ccc0236e8c5373d0543599e Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 30 Oct 2020 23:51:16 -0300 Subject: [PATCH] Cleanup root directory from misc files Part-of: --- cmd_or_ps.ps1 => data/misc/cmd_or_ps.ps1 | 0 .../misc/gstreamer-full-default.map | 0 gst-env.py | 5 +++-- meson_options.txt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename cmd_or_ps.ps1 => data/misc/cmd_or_ps.ps1 (100%) rename gstreamer-full-default.map => data/misc/gstreamer-full-default.map (100%) diff --git a/cmd_or_ps.ps1 b/data/misc/cmd_or_ps.ps1 similarity index 100% rename from cmd_or_ps.ps1 rename to data/misc/cmd_or_ps.ps1 diff --git a/gstreamer-full-default.map b/data/misc/gstreamer-full-default.map similarity index 100% rename from gstreamer-full-default.map rename to data/misc/gstreamer-full-default.map diff --git a/gst-env.py b/gst-env.py index df3e402332..94dba9b579 100755 --- a/gst-env.py +++ b/gst-env.py @@ -458,8 +458,9 @@ def get_subprocess_env(options, gst_version): return env def get_windows_shell(): - command = ['powershell.exe' ,'-noprofile', '-executionpolicy', 'bypass', '-file', 'cmd_or_ps.ps1'] - result = subprocess.check_output(command, cwd=SCRIPTDIR) + command = ['powershell.exe' ,'-noprofile', '-executionpolicy', 'bypass', '-file', + os.path.join(SCRIPTDIR, 'data', 'misc', 'cmd_or_ps.ps1')] + result = subprocess.check_output(command) return result.decode().strip() if __name__ == "__main__": diff --git a/meson_options.txt b/meson_options.txt index 818855a862..1fa3c6d63b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,7 +21,7 @@ option('qt5', type : 'feature', value : 'auto', description : 'Qt5 Support') option('custom_subprojects', type : 'string', value : '', description : 'Comma-separated project names') option('gst-full-libraries', type : 'array', value : [], description : '''List of libraries to expose in gstreamer-full's ABI. gstreamer, glib and gobject are always included.''') -option('gst-full-version-script', type : 'string', value: 'gstreamer-full-default.map', +option('gst-full-version-script', type : 'string', value: 'data/misc/gstreamer-full-default.map', description : 'path of the version script to be used by the linker, see https://www.gnu.org/software/gnulib/manual/html_node/LD-Version-Scripts.html') option('gst-full-plugins', type : 'string', value : '*', description : '''List of plugins to expose in gstreamer-full's ABI with the syntax plugin1;plugin2. By default '*' will export all plugins enabled by the build process.''')