10
0
mirror of https://github.com/QuantumPackage/qp2.git synced 2024-12-22 20:34:58 +01:00

Merge branch 'dev' into dev-lct

This commit is contained in:
Emmanuel Giner 2019-04-08 16:16:15 +02:00
commit 06f9010c12
2 changed files with 3 additions and 3 deletions

4
configure vendored
View File

@ -276,8 +276,8 @@ 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
${QP_ROOT}/bin/opam init --disable-sandboxing --verbose \ rm $OPAMROOT/config
--yes --comp=4.07.0 ${QP_ROOT}/bin/opam init --disable-sandboxing --verbose --yes
eval $(${QP_ROOT}/bin/opam env) eval $(${QP_ROOT}/bin/opam env)
opam install -y ${OCAML_PACKAGES} || exit 1 opam install -y ${OCAML_PACKAGES} || exit 1

View File

@ -538,7 +538,7 @@ def get_binaries(path_module):
import subprocess import subprocess
try: try:
cmd = 'grep -l -e "^program " {0}/*.irp.f'.format(path_module.abs) cmd = 'grep -l -e "^\\s*program " {0}/*.irp.f'.format(path_module.abs)
process = subprocess.Popen([cmd], process = subprocess.Popen([cmd],
shell=True, shell=True,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,