mirror of
https://github.com/QuantumPackage/qp2.git
synced 2024-08-16 17:28:32 +02:00
Merge branch 'dev' into dev-lcpq
This commit is contained in:
commit
8deb6ae0d7
4
configure
vendored
4
configure
vendored
@ -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
|
||||||
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user