update to use mparser dune build

comby-tools · Feb 22, 2021 · 13a5172 · 13a5172
1 parent e6051e2
commit 13a5172
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/comby.opam b/comby.opam
@@ -16,12 +16,12 @@ depends: [
   "conduit-lwt-unix"
   "hack_parallel"
   "mparser-comby"
+  "mparser-comby-pcre"
   "ppxlib"
   "ppx_deriving"
   "angstrom" {< "0.14.0"}
   "opium"
   "pcre"
-  "oasis"
   "tls"
   "camlzip"
   "shell"
@@ -33,7 +33,8 @@ depends: [
   "bisect_ppx" {with-test & dev & >= "2.5.0"}
 ]
 pin-depends: [
-  ["mparser-comby.git" "git+https://github.com/comby-tools/mparser.git"]
+  ["mparser-comby.git" "git+https://github.com/comby-tools/mparser.git#dune"]
+  ["mparser-comby-pcre.git" "git+https://github.com/comby-tools/mparser.git#dune"]
   ["patdiff.git" "git+https://github.com/rvantonder/patdiff.git#0.14.0-patch-compatible-diffs"]
   ["camlzip.git" "git+https://github.com/rvantonder/camlzip.git#zip64"]
   ["hack_parallel.git" "git+https://github.com/rvantonder/hack_parallel.git#4.10-unconstrained-core"]

diff --git a/lib/configuration/dune b/lib/configuration/dune
@@ -3,4 +3,4 @@
   (public_name comby.configuration)
   (instrumentation (backend bisect_ppx))
   (preprocess (pps ppx_deriving.show ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson))
-  (libraries camlzip comby.statistics comby.parsers comby.match comby.language ppxlib core core.uuid mparser mparser.pcre yojson ppx_deriving_yojson hack_parallel toml lwt lwt.unix patdiff))
+  (libraries camlzip comby.statistics comby.parsers comby.match comby.language ppxlib core core.uuid mparser-comby yojson ppx_deriving_yojson hack_parallel toml lwt lwt.unix patdiff))
diff --git a/lib/dune b/lib/dune
@@ -6,8 +6,7 @@
   (libraries 
    ppxlib 
    core 
-   mparser 
-   mparser.pcre 
+   mparser-comby
    comby.language
    comby.match
    comby.matchers

diff --git a/lib/matchers/dune b/lib/matchers/dune
@@ -3,4 +3,4 @@
   (public_name comby.matchers)
   (instrumentation (backend bisect_ppx))
   (preprocess (pps ppx_here ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson))
-  (libraries comby.parsers comby.match angstrom ppxlib core core.uuid mparser mparser.pcre yojson ppx_deriving_yojson))
+  (libraries comby.parsers comby.match angstrom ppxlib core core.uuid mparser-comby mparser-comby-pcre yojson ppx_deriving_yojson))
diff --git a/lib/parsers/dune b/lib/parsers/dune
@@ -3,4 +3,4 @@
   (public_name comby.parsers)
   (instrumentation (backend bisect_ppx))
   (preprocess (pps ppx_sexp_conv))
-  (libraries angstrom ppxlib core mparser mparser.pcre))
+  (libraries angstrom ppxlib core mparser-comby))