From b51679b35ecc59ea8746401cc0e9b8cc14aace0a Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 18 Apr 2023 11:20:51 +0200 Subject: [PATCH] Fix zcat --- bin/zcat | 15 +++++++++++++++ configure | 1 + external/qp2-dependencies | 2 +- scripts/compilation/qp_create_ninja | 3 ++- src/ezfio_files/00.create.bats | 1 - 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100755 bin/zcat diff --git a/bin/zcat b/bin/zcat new file mode 100755 index 00000000..ebf64b7d --- /dev/null +++ b/bin/zcat @@ -0,0 +1,15 @@ +#!/usr/bin/env python3 + +import sys +import gzip + +# Check if a file path has been provided +if len(sys.argv) < 2: + print("Usage: zcat ") + sys.exit(1) + +# Open the gzip file +with gzip.open(sys.argv[1], "rt") as f: + # Read the contents of the file and print to standard output + print(f.read()) + diff --git a/configure b/configure index 9b4c4b03..d4e27ede 100755 --- a/configure +++ b/configure @@ -226,6 +226,7 @@ EOF cd "\${QP_ROOT}"/external tar --gunzip --extract --file qp2-dependencies/zeromq-4.2.5.tar.gz cd zeromq-* + [[ ${SYSTEM} = Darwin ]] && ./autogen.sh ./configure --prefix="\$QP_ROOT" --without-libsodium --enable-libunwind=no make -j 8 make install diff --git a/external/qp2-dependencies b/external/qp2-dependencies index fd43778e..b9e877d9 160000 --- a/external/qp2-dependencies +++ b/external/qp2-dependencies @@ -1 +1 @@ -Subproject commit fd43778e12bb5858c4c780c34346be0f158b8cc7 +Subproject commit b9e877d9a9444a2aac23ec94b4a174caa4a10dd2 diff --git a/scripts/compilation/qp_create_ninja b/scripts/compilation/qp_create_ninja index aad85778..aa93afb3 100755 --- a/scripts/compilation/qp_create_ninja +++ b/scripts/compilation/qp_create_ninja @@ -40,7 +40,8 @@ from qp_path import QP_ROOT, QP_SRC, QP_EZFIO LIB = " -lz" 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 -ldl" +ZMQ_LIB = "-lzmq -lf77zmq" +#ZMQ_LIB = join("$QP_ROOT", "lib", "libf77zmq.a") + " " + join("$QP_ROOT", "lib", "libzmq.a") + " -lstdc++ -lrt -ldl" ROOT_BUILD_NINJA = join("$QP_ROOT", "config", "build.ninja") ROOT_BUILD_NINJA_EXP = join(QP_ROOT, "config", "build.ninja") ROOT_BUILD_NINJA_EXP_tmp = join(QP_ROOT, "config", "build.ninja.tmp") diff --git a/src/ezfio_files/00.create.bats b/src/ezfio_files/00.create.bats index cfa6247d..496519f4 100644 --- a/src/ezfio_files/00.create.bats +++ b/src/ezfio_files/00.create.bats @@ -25,7 +25,6 @@ function run { @test "B-B" { - qp set_file b2_stretched.ezfio run b2_stretched.zmt 1 0 6-31g }