LCPQ/qp2
9
1
Fork 0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-22 03:23:29 +01:00
Code Releases Activity

Fixing travis

Browse Source
This commit is contained in:
Anthony Scemama 2019-07-24 12:33:08 +02:00
parent 0007455846
commit 2f89be4ee9
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -303,13 +303,12 @@ EOF
rm ${QP_ROOT}/external/opam_installer.sh rm ${QP_ROOT}/external/opam_installer.sh
source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
execute << EOF opam switch create ocaml-base-compiler.4.07.1
opam switch create ocaml-base-compiler.4.07.1 || exit 1 opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
${QP_ROOT}/bin/opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
eval $(${QP_ROOT}/bin/opam env) eval $(opam env)
opam install -y ${OCAML_PACKAGES} || exit 1 opam install -y ${OCAML_PACKAGES} || exit 1
EOF
else else
# Conventional commands # Conventional commands
execute << EOF execute << EOF
@ -322,14 +321,13 @@ EOF
echo \${QP_ROOT}/bin \ echo \${QP_ROOT}/bin \
| sh \${QP_ROOT}/external/opam_installer.sh | sh \${QP_ROOT}/external/opam_installer.sh
EOF EOF
execute << EOF
rm \${QP_ROOT}/external/opam_installer.sh rm \${QP_ROOT}/external/opam_installer.sh
source \${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true source \${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
opam switch create ocaml-base-compiler.4.07.1 || exit 1 opam switch create ocaml-base-compiler.4.07.1 || exit 1
\${QP_ROOT}/bin/opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing opam init --verbose --yes --compiler=4.07.1 --disable-sandboxing
eval $(opam env)
EOF EOF
execute << EOF execute << EOF
eval \$(\${QP_ROOT}/bin/opam env)
opam install -y \${OCAML_PACKAGES} || exit 1 opam install -y \${OCAML_PACKAGES} || exit 1
EOF EOF
fi fi