10
0
mirror of https://github.com/LCPQ/quantum_package synced 2024-06-02 11:25:26 +02:00

Fix ocaml instalation

This commit is contained in:
Thomas Applencourt 2015-06-08 15:38:37 +02:00
parent 4b448cea4d
commit 273d46d3ea
2 changed files with 5 additions and 6 deletions

View File

@ -28,8 +28,7 @@ then
echo "Installation of OPAM failed"
exit 2
fi
${QP_ROOT}/bin/opam config setup -a --dot-profile ${QP_ROOT}/qmcchemrc || exit 1
touch ${QP_ROOT}/bin/opam
${QP_ROOT}/bin/opam config setup -a || exit 1
export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH}
export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH}

View File

@ -41,7 +41,7 @@ path_github = {"head": "http://github.com/", "tail": "archive/master.tar.gz"}
ocaml = Info(
url='http://raw.github.com/ocaml/opam/master/shell/opam_installer.sh',
description=' ocaml',
description=' ocaml (it will take some time)',
default_path=join(QP_ROOT_BIN, "opam"))
m4 = Info(
@ -236,9 +236,9 @@ if "ninja" in l_need_genealogy:
extension = splitext(url)[1]
path_archive = "Downloads/{0}{1}".format("ninja", extension)
l_cmd = ["cd install;",
"wget {0} -O {1} -o /dev/null ;".format(url, path_archive),
"./scripts/install_ninja.sh", "cd -"]
l_cmd = ["cd install &&",
"wget {0} -O {1} -o /dev/null &&".format(url, path_archive),
"./scripts/install_ninja.sh &&", "cd -"]
check_output(" ".join(l_cmd), shell=True)