LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2024-07-03 09:55:59 +02:00
Code Issues Releases Wiki Activity

Add install_verbose for opam...

Browse Source
This commit is contained in:
Thomas Applencourt 2015-06-08 15:59:26 +02:00
parent 12de4c1de3
commit 41098f94b2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup_environment.py
View File

@ -41,7 +41,7 @@ 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',
description=' ocaml (it will take some time)', description=' ocaml (it will take some time roughly 20min)',
default_path=join(QP_ROOT_BIN, "opam")) default_path=join(QP_ROOT_BIN, "opam"))
m4 = Info( m4 = Info(
@ -238,7 +238,7 @@ if "ninja" in l_need_genealogy:
l_cmd = ["cd install &&", l_cmd = ["cd install &&",
"wget {0} -O {1} -o /dev/null &&".format(url, path_archive), "wget {0} -O {1} -o /dev/null &&".format(url, path_archive),
"./scripts/install_ninja.sh &&", "cd -"] "./scripts/install_ninja.sh 2> /dev/null &&", "cd -"]
check_output(" ".join(l_cmd), shell=True) check_output(" ".join(l_cmd), shell=True)
@ -259,6 +259,9 @@ def create_rule():
" description = Downloading ${descr}", "", "rule install", " description = Downloading ${descr}", "", "rule install",
" command = ./scripts/install_${target}.sh > _build/${target}.log 2>&1", " command = ./scripts/install_${target}.sh > _build/${target}.log 2>&1",
" description = Installing ${descr}", "" " description = Installing ${descr}", ""
"rule install_verbose",
" command = ./scripts/install_${target}.sh | tee _build/${target}.log 2>&1",
" description = Installing ${descr}", ""
] ]
return l_rules return l_rules
@ -284,7 +287,13 @@ for need in l_need_genealogy:
# Build to install # Build to install
l_dependancy = [d_info[i].default_path for i in d_dependancy[need] if i in l_need_genealogy] l_dependancy = [d_info[i].default_path for i in d_dependancy[need] if i in l_need_genealogy]
l_build += ["build {0}: install {1} {2}".format(d_info[need].default_path, if need == "ocaml":
install ="install_verbose"
else:
install ="install"
l_build += ["build {0}: {1} {2} {3}".format(d_info[need].default_path,
install,
archive_path, archive_path,
" ".join(l_dependancy)), " ".join(l_dependancy)),
" target = {0}".format(need), " target = {0}".format(need),