diff --git a/dune-project b/dune-project index 4900f36..c1205bf 100644 --- a/dune-project +++ b/dune-project @@ -17,15 +17,5 @@ (description "The pry/pdb experience via a toplevel") (depends (ocaml (>= 4.14)) - (dune (>= 3.7)) (ppxlib (>= 0.28.0)) - ppx_interact_runtime)) - -(package - (name ppx_interact_runtime) - (synopsis "Opens a REPL in context") - (description "Runtime library for ppx_interact") - (depends - (ocaml (>= 4.14)) - (dune (>= 3.7)) (linenoise (>= 1.4.0)))) diff --git a/ppx/dune b/ppx/dune index 84cfe23..7d88d68 100644 --- a/ppx/dune +++ b/ppx/dune @@ -2,7 +2,7 @@ (public_name ppx_interact) (kind ppx_rewriter) (libraries ppxlib) - (ppx_runtime_libraries ppx_interact_runtime) + (ppx_runtime_libraries ppx_interact.runtime) (preprocess (pps ppxlib.metaquot))) diff --git a/ppx_interact.opam b/ppx_interact.opam index 6dc24b4..bf8f8ed 100644 --- a/ppx_interact.opam +++ b/ppx_interact.opam @@ -8,10 +8,10 @@ license: "MIT" homepage: "https://github.com/dariusf/ppx_interact" bug-reports: "https://github.com/dariusf/ppx_interact/issues" depends: [ + "dune" {>= "3.7"} "ocaml" {>= "4.14"} - "dune" {>= "3.7" & >= "3.7"} "ppxlib" {>= "0.28.0"} - "ppx_interact_runtime" + "linenoise" {>= "1.4.0"} "odoc" {with-doc} ] build: [ diff --git a/ppx_interact_runtime.opam b/ppx_interact_runtime.opam deleted file mode 100644 index 6de5463..0000000 --- a/ppx_interact_runtime.opam +++ /dev/null @@ -1,30 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -synopsis: "Opens a REPL in context" -description: "Runtime library for ppx_interact" -maintainer: ["darius.foo.tw@gmail.com"] -authors: ["Darius Foo"] -license: "MIT" -homepage: "https://github.com/dariusf/ppx_interact" -bug-reports: "https://github.com/dariusf/ppx_interact/issues" -depends: [ - "ocaml" {>= "4.14"} - "dune" {>= "3.7" & >= "3.7"} - "linenoise" {>= "1.4.0"} - "odoc" {with-doc} -] -dev-repo: "git+https://github.com/dariusf/ppx_interact.git" -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - # remove tests - "@doc" {with-doc} - ] -] diff --git a/ppx_interact_runtime.opam.template b/ppx_interact_runtime.opam.template deleted file mode 100644 index 2bb5a97..0000000 --- a/ppx_interact_runtime.opam.template +++ /dev/null @@ -1,14 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - # remove tests - "@doc" {with-doc} - ] -] diff --git a/runtime/dune b/runtime/dune index fcdf5af..ed2c872 100644 --- a/runtime/dune +++ b/runtime/dune @@ -1,5 +1,6 @@ (library - (public_name ppx_interact_runtime) + (name ppx_interact_runtime) + (public_name ppx_interact.runtime) (libraries compiler-libs.toplevel unix linenoise)) (env