mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-22 14:06:23 +00:00
Windows fixes for scripts
subprocess.call runs programs directly when shell=False and can't take advantage of the association that makes python scripts executable in shells, so explicitly add the interpreter to the args for call. Run the windows command prompt by default in gst-uninstalled.
This commit is contained in:
parent
3b8dc3b4d2
commit
1f4380ac0a
2 changed files with 6 additions and 3 deletions
4
configure
vendored
4
configure
vendored
|
@ -63,8 +63,8 @@ def configure_meson(args, options):
|
|||
os.mkdir(build_dir)
|
||||
|
||||
try:
|
||||
subprocess.check_call([meson, "../"] + args, cwd=build_dir)
|
||||
subprocess.check_call([os.path.join(ROOTDIR, 'meson', 'mesonconf.py')]
|
||||
subprocess.check_call([sys.executable, meson, "../"] + args, cwd=build_dir)
|
||||
subprocess.check_call([sys.executable, os.path.join(ROOTDIR, 'meson', 'mesonconf.py')]
|
||||
+ get_configs(meson), cwd=build_dir)
|
||||
except subprocess.CalledProcessError as e:
|
||||
print("EXIT meson return %s" % e.returncode)
|
||||
|
|
|
@ -123,7 +123,10 @@ if __name__ == "__main__":
|
|||
exit(1)
|
||||
|
||||
if not args:
|
||||
args = [os.environ.get("SHELL", os.path.realpath("/bin/sh"))]
|
||||
if os.name is 'nt':
|
||||
args = [os.environ.get("COMSPEC", r"C:\WINDOWS\system32\cmd.exe")]
|
||||
else:
|
||||
args = [os.environ.get("SHELL", os.path.realpath("/bin/sh"))]
|
||||
if args[0] == "/bin/bash":
|
||||
args.append("--noprofile")
|
||||
|
||||
|
|
Loading…
Reference in a new issue