Merge pull request #1 from kit-ty-kate/master

Integrate the runtime into the ppx_interact package
dariusf · Mar 9, 2023 · 07eeadc · 07eeadc
2 parents 3cc1a4f + b7cf49c
commit 07eeadc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/ppx_interact_runtime.opam.template b/ppx_interact_runtime.opam.template
diff --git 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