diff --git a/install/scripts/install_f77zmq.sh b/install/scripts/install_f77zmq.sh index ff2417fb..8357857c 100755 --- a/install/scripts/install_f77zmq.sh +++ b/install/scripts/install_f77zmq.sh @@ -15,6 +15,7 @@ function _install() make -j 8 || exit 1 mv libf77zmq.a "${QP_ROOT}"/lib || exit 1 mv libf77zmq.so "${QP_ROOT}"/lib || exit 1 + cp f77_zmq.h "${QP_ROOT}"/src/ZMQ/ cd - return 0 } diff --git a/scripts/compilation/qp_create_ninja.py b/scripts/compilation/qp_create_ninja.py index 7171c2df..a57c7cbf 100755 --- a/scripts/compilation/qp_create_ninja.py +++ b/scripts/compilation/qp_create_ninja.py @@ -36,8 +36,8 @@ except ImportError: from qp_path import QP_ROOT, QP_SRC, QP_EZFIO LIB = "" # join(QP_ROOT, "lib", "rdtsc.o") -EZFIO_LIB = join(QP_ROOT, "lib", "libezfio.a") -ZMQ_LIB = join(QP_ROOT, "lib", "libzmq.a") + " " + join(QP_ROOT, "lib", "libf77zmq.a") +EZFIO_LIB = join(QP_ROOT, "lib", "libezfio_irp.a") +ZMQ_LIB = join(QP_ROOT, "lib", "libf77zmq.a") + " " + join(QP_ROOT, "lib", "libzmq.a") + " -lstdc++ -lrt" ROOT_BUILD_NINJA = join(QP_ROOT, "config", "build.ninja") header = r"""# @@ -262,7 +262,7 @@ def ninja_ezfio_rule(): l_flag = ["export {0}='${0}'".format(flag) for flag in ["FC", "FCFLAGS", "IRPF90"]] - install_lib_ezfio = join(QP_ROOT, 'install', 'EZFIO', "lib", "libezfio.a") + install_lib_ezfio = join(QP_ROOT, 'install', 'EZFIO', "lib", "libezfio_irp.a") l_cmd = ["cd {0}".format(QP_EZFIO)] + l_flag l_cmd += ["rm -f make.config ; ninja && ln -sf {0} {1}".format(install_lib_ezfio, EZFIO_LIB)] diff --git a/scripts/module/module_handler.py b/scripts/module/module_handler.py index ebbc367a..136dc8cf 100755 --- a/scripts/module/module_handler.py +++ b/scripts/module/module_handler.py @@ -88,7 +88,7 @@ def get_l_module_descendant(d_child, l_module): except KeyError: print >> sys.stderr, "Error: " print >> sys.stderr, "`{0}` is not a submodule".format(module) - print >> sys.stderr, "Check the typo (orthograph, case, '/', etc.) " + print >> sys.stderr, "Check the typo (spelling, case, '/', etc.) " sys.exit(1) return list(set(l))