From 93dd5c52e74bf16185b2caf8d7e2682c74080561 Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 6 Apr 2020 15:28:18 +0100 Subject: [PATCH 1/3] Fix package installation with dune --- bin/dune | 1 + lib/dune | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/dune b/bin/dune index 11d8b42..936d96f 100644 --- a/bin/dune +++ b/bin/dune @@ -1,4 +1,5 @@ (executable (name main) + (public_name anthill) (libraries anthill core pcre mparser mparser.pcre lwt lambda-term) (preprocess (pps lwt_ppx))) diff --git a/lib/dune b/lib/dune index f6bff2f..e8670c5 100644 --- a/lib/dune +++ b/lib/dune @@ -1,5 +1,6 @@ (library (name anthill) + (public_name anthill) (modules_without_implementation engine) (libraries core pcre mparser mparser.pcre lwt lambda-term) (preprocess (pps lwt_ppx))) From a360e140087145dcf2beb673d155975ed8a8e248 Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 6 Apr 2020 15:28:38 +0100 Subject: [PATCH 2/3] Remove unused files --- _tags | 5 -- bin/.merlin | 137 ---------------------------------------------------- 2 files changed, 142 deletions(-) delete mode 100644 _tags delete mode 100644 bin/.merlin diff --git a/_tags b/_tags deleted file mode 100644 index c45c3c3..0000000 --- a/_tags +++ /dev/null @@ -1,5 +0,0 @@ -true: package(core),package(mparser,mparser.pcre),package(rresult) -true: thread,debug - - or : package(lambda-term, lwt_ppx) -: package(lablgtk2, lablgtk2.auto-init) diff --git a/bin/.merlin b/bin/.merlin deleted file mode 100644 index 18668cc..0000000 --- a/bin/.merlin +++ /dev/null @@ -1,137 +0,0 @@ -EXCLUDE_QUERY_DIR -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/base_internalhash_types -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/caml -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/md5 -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/shadow_stdlib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base_bigstring -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base_quickcheck -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/bin_prot -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/bin_prot/shape -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/bytes -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/default_config -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/dyn -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/lib_default -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/library -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/charInfo_width -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core/error_checking_mutex -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/base_for_tests -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/bounded_int_table -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/flags -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/version_util -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/fieldslib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/jane-street-headers -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lambda-term -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt/unix -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt_log -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt_log/core -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt_react -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/mmap -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/mparser -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocaml -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocaml/threads -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocplib-endian -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocplib-endian/bigstring -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/parsexp -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/pcre -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_assert/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_bench/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_compare/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_enumerate/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_expect/collector -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_expect/common -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_expect/config -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_hash/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_here/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_inline_test/config -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_inline_test/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_module_timer/runtime -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_sexp_conv/runtime-lib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/react -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/result -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/seq -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/sexplib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/sexplib/unix -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/sexplib0 -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/spawn -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/splittable_random -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/stdio -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/time_now -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/typerep -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/variantslib -B /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/zed -B ../_build/default/bin/.main.eobjs/byte -B ../_build/default/lib/.anthill.objs/byte -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/base_internalhash_types -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/caml -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/md5 -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base/shadow_stdlib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base_bigstring -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/base_quickcheck -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/bin_prot -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/bin_prot/shape -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/bytes -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/default_config -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/dyn -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/lib_default -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/camomile/library -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/charInfo_width -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core/error_checking_mutex -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/base_for_tests -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/bounded_int_table -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/flags -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/core_kernel/version_util -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/fieldslib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/jane-street-headers -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lambda-term -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt/unix -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt_log -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt_log/core -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/lwt_react -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/mmap -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/mparser -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocaml -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocaml/threads -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocplib-endian -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ocplib-endian/bigstring -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/parsexp -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/pcre -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_assert/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_bench/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_compare/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_enumerate/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_expect/collector -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_expect/common -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_expect/config -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_hash/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_here/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_inline_test/config -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_inline_test/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_module_timer/runtime -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/ppx_sexp_conv/runtime-lib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/react -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/result -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/seq -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/sexplib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/sexplib/unix -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/sexplib0 -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/spawn -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/splittable_random -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/stdio -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/time_now -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/typerep -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/variantslib -S /home/mdemello/.opam/ocaml-base-compiler.4.09.0/lib/zed -S . -S ../lib -FLG -ppx '/home/mdemello/github/anthill/_build/default/.ppx/bcab0be011c28261c514e69f4fe141f8/ppx.exe --as-ppx' -FLG -w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs From 5b56477f4744a8a3de5956af89f09a558a8495de Mon Sep 17 00:00:00 2001 From: Kate Date: Mon, 6 Apr 2020 15:29:03 +0100 Subject: [PATCH 3/3] Untag dune as a build dependency --- anthill.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anthill.opam b/anthill.opam index fb41a17..9d618b9 100644 --- a/anthill.opam +++ b/anthill.opam @@ -4,7 +4,7 @@ build: [ ] depends: [ "ocaml" {>= "4.06"} - "dune" {build & >= "1.0"} + "dune" {>= "1.0"} "core" "pcre" "mparser"