mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 17:51:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "setup.py: Use the detected Ninja and quote build_dir"

Browse source 
This reverts commit 9a64b727bf.

Closes https://bugzilla.gnome.org/show_bug.cgi?id=776801

The actual fix is in the next commit.
This commit is contained in:
Nirbheek Chauhan 2017-01-03 22:53:18 +05:30
parent 9a64b727bf
commit b75903c8f8
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common.py
View file

@ -45,9 +45,10 @@ def git(*args, repository_path='.'):
stderr=subprocess.STDOUT).decode() stderr=subprocess.STDOUT).decode()
def accept_command(commands): def accept_command(commands):
"""Search @commands and returns the first found command""" """Search @commands and returns the first found absolute path."""
for command in commands: for command in commands:
if shutil.which(command): command = shutil.which(command)
if command:
return command return command
return None return None

2
setup.py
View file

@ -54,7 +54,7 @@ class GstBuildConfigurer:
subprocess.check_call( subprocess.check_call(
[sys.executable, meson, "../"] + self.args + self.get_configs(), cwd=build_dir) [sys.executable, meson, "../"] + self.args + self.get_configs(), cwd=build_dir)
print("\nYou can now build GStreamer and its various subprojects running:\n" print("\nYou can now build GStreamer and its various subprojects running:\n"
" $ {} -C {!r}".format(ninja, build_dir)) " $ ninja -C %s" % build_dir)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
return False return False