LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2025-01-05 11:00:10 +01:00
Code Issues Releases Wiki Activity

Fixed ninja bug

Browse Source
This commit is contained in:
Anthony Scemama 2015-09-08 16:41:26 +02:00
parent a55b3cb651
commit d071a9e395
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -71,7 +71,7 @@ from collections import namedtuple
Info = namedtuple("Info", ["url", "description", "default_path"]) Info = namedtuple("Info", ["url", "description", "default_path"])
path_github = {"head": "http://github.com/", "tail": "archive/master.tar.gz"} path_github = {"head": "http://github.com", "tail": "archive/master.tar.gz"}
ocaml = Info( ocaml = Info(
url='http://raw.github.com/ocaml/opam/master/shell/opam_installer.sh', url='http://raw.github.com/ocaml/opam/master/shell/opam_installer.sh',
@ -180,6 +180,8 @@ def check_output(*popenargs, **kwargs):
cmd = popenargs[0] cmd = popenargs[0]
error = subprocess.CalledProcessError(retcode, cmd) error = subprocess.CalledProcessError(retcode, cmd)
error.output = output error.output = output
# print output
# print unused_err
raise error raise error
return output return output
@ -224,7 +226,7 @@ def checking(d_dependency):
return a return a
except subprocess.CalledProcessError: except (OSError,subprocess.CalledProcessError):
default_path = d_info[binary].default_path default_path = d_info[binary].default_path
if os.path.exists(default_path): if os.path.exists(default_path):
return default_path return default_path
@ -341,9 +343,9 @@ _|_ | | _> |_ (_| | | (_| |_ | (_) | |
extension = splitext(url)[1] extension = splitext(url)[1]
path_archive = "Downloads/{0}{1}".format("ninja", extension) path_archive = "Downloads/{0}{1}".format("ninja", extension)
l_cmd = ["cd install &&", l_cmd = ["set -x ;", "cd install &&",
"wget {0} -O {1} -o /dev/null &&".format(url, path_archive), "wget {0} -O {1} &&".format(url, path_archive),
"./scripts/install_ninja.sh 2> /dev/null &&", "cd -"] "./scripts/install_ninja.sh &&", "cd -"]
try: try:
check_output(" ".join(l_cmd), shell=True) check_output(" ".join(l_cmd), shell=True)