From 685e883979e34a9fdd71174e3f7a779091ca70d5 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 14 Apr 2020 19:14:21 +0200 Subject: [PATCH] Adapted for EZFIO 2.0 --- install/Makefile | 10 ++++++---- ocaml/qptypes_generator.ml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install/Makefile b/install/Makefile index 5486960..2c599ec 100644 --- a/install/Makefile +++ b/install/Makefile @@ -2,7 +2,7 @@ default_target: all Downloads/irpf90.tar.gz: wget --no-check-certificate \ - "https://gitlab.com/scemama/irpf90/-/archive/v1.7.2/irpf90-v1.7.2.tar.gz" \ + "https://gitlab.com/scemama/irpf90/-/archive/v2.0.0/irpf90-v2.0.0.tar.gz" \ -O $@.tmp -o /dev/null && mv $@.tmp $@ Downloads/ezfio.tar.gz: @@ -52,9 +52,11 @@ _build/qmcchemrc.ok ../qmcchemrc: _build/irpf90.ok ../bin/irpman ../bin/irpf90 _ touch _build/$${target}.ok || cat _build/$${target}.log _build/ocaml.ok ../bin/opam: Downloads/opam_installer.sh _build/qmcchemrc.ok ../qmcchemrc - export target=ocaml; \ - ./scripts/install_$${target}.sh > _build/$${target}.log 2>&1 &&\ - touch _build/$${target}.ok || cat _build/$${target}.log + which opam && touch _build/$${target}.ok ../bin/opam || \ + ( export target=ocaml; \ + ./scripts/install_$${target}.sh > _build/$${target}.log 2>&1 &&\ + touch _build/$${target}.ok || cat _build/$${target}.log ;\ + ) _build/ocaml_zmq.ok: ../bin/opam ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils.h _build/ocaml.ok _build/zmq.ok ../lib/libzmq.a ../lib/libzmq.so.5 ../lib/libzmq.so ../lib/zmq.h ../lib/zmq_utils.h export target=ocaml_zmq; \ diff --git a/ocaml/qptypes_generator.ml b/ocaml/qptypes_generator.ml index 070e733..387266c 100644 --- a/ocaml/qptypes_generator.ml +++ b/ocaml/qptypes_generator.ml @@ -296,7 +296,7 @@ let input_lines filename = let create_ezfio_handler () = let lines = input_lines "ezfio.ml" - |> List.mapi (fun i l -> if i > 474 then Some l else None) + |> List.mapi (fun i l -> if i > 419 then Some l else None) |> List.filter (fun x -> x <> None) |> List.map (fun x -> match x with