düner kebab

yay

.gitignore

@@ -2,6 +2,7 @@ _build
 *.install
 *.native
 *.byte
+.merlin
 
 tmp
 *~

.ocamlinit

@@ -1,12 +1,14 @@
 #require "uucp,uuseg,uutf"
-#directory "_build/src"
-#load "notty.cma"
-#load "notty_top.cma"
 
-#require "unix"
-#directory "_build/unix"
-#load "notty_unix.cma"
+#directory "_build/default/src"
+#directory "_build/default/src/.notty.objs/byte"
+#directory "_build/default/src-unix"
+#directory "_build/default/src-unix/.notty_unix.objs/byte"
+#directory "_build/default/src-lwt"
+#directory "_build/default/src-lwt/.notty_lwt.objs/byte"
 
-#require "lwt,lwt.unix"
-#directory "_build/lwt"
+#load "notty.cma"
+#load "notty_unix.cma"
 #load "notty_lwt.cma"
+
+#use "src/notty_top_init.ml"

README.md

@@ -25,8 +25,8 @@ Notty's core API was heavily influenced by Haskell's [Vty][vty].
 Check out the [documentation], [examples], or peek directly into the [interface]
 file.
 
-Building with `pkg/pkg.ml build --with-lwt true --examples true` will produce
-several little example programs that also double as tests.
+Building with `dune build @examples` will produce several little example
+programs that also double as tests.
 
 ```OCaml
 (* Game of Life with ZX Spectrum kitsch. *)

benchmarks/dune

@@ -0,0 +1,3 @@
+(executable
+  (name speed)
+  (libraries notty notty.unix common unmark unmark.cli))

dune-project

@@ -0,0 +1,3 @@
+(lang dune 1.7)
+(name notty)
+(version dev)

examples/dune

@@ -0,0 +1,26 @@
+(library
+  (name common)
+  (modules common)
+  (libraries notty notty.unix))
+
+(library
+  (name common_lwt)
+  (modules common_lwt)
+  (libraries common notty.lwt))
+
+(executables
+  (names testpatterns colors almondbread crops cursor cuts emoji inline keys
+         letters mouse thisbig runes sierpinski rain sierpinski_lwt linear
+         life)
+  (modules testpatterns colors almondbread crops cursor cuts emoji inline keys
+           letters mouse thisbig runes sierpinski rain sierpinski_lwt linear
+           life)
+  (libraries common common_lwt))
+
+(alias
+  (name ex)
+  (package notty)
+  (deps testpatterns.exe colors.exe almondbread.exe crops.exe cursor.exe
+        cuts.exe emoji.exe inline.exe keys.exe letters.exe mouse.exe
+        thisbig.exe runes.exe sierpinski.exe rain.exe sierpinski_lwt.exe
+        linear.exe life.exe))

opam → notty.opam

@@ -12,24 +12,15 @@ description:
   of composable images. It tries to abstract away the basic terminal programming
   model, providing something simpler and more expressive."
 
-
-build: [
-  "ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"
-          "--with-lwt" "%{lwt:installed}%"
-]
+build: [ [ "dune" "subst" ] {pinned}
+         [ "dune" "build" "-p" name "-j" jobs ] ]
 depends: [
-  "ocaml" { >= "4.05.0" }
-  "ocamlbuild" {build}
-  "ocamlfind" {build}
-  "topkg" {build}
-  "ocb-stubblr" {build & >="0.1.0"}
+  "ocaml" {>= "4.05.0"}
+  "dune" {build & >= "1.7"}
   "uchar"
   "uucp" {>= "2.0.0"}
   "uuseg" {>= "1.0.0"}
   "uutf" {>= "1.0.0"}
 ]
 depopts: [ "lwt" ]
-conflicts: [
-  "ocb-stubblr" {<"0.1.0"}
-  "lwt" {<"2.5.2"}
-]
+conflicts: [ "lwt" {<"2.5.2"} ]

src-lwt/dune

@@ -0,0 +1,7 @@
+(library
+  (public_name notty.lwt)
+  (synopsis "Notty Lwt+Unix IO")
+  (name notty_lwt)
+  (wrapped false)
+  (optional)
+  (libraries notty notty.unix lwt lwt.unix))

lwt/notty_lwt.ml → src-lwt/notty_lwt.ml

@@ -125,7 +125,8 @@ module Term = struct
     winsize fd |> whenopt (set_size t);
     Lwt.async (fun () -> write t); (* XXX async? *)
     if dispose then
-      Lwt_sequence.add_r (fun () -> release t) Lwt_main.exit_hooks |> ignore;
+      Lwt_sequence.add_r (fun () -> release t)
+        Lwt_main.exit_hooks [@warning "-3"] |> ignore;
     t
 
   let events t = t.events

src-unix/dune

@@ -0,0 +1,11 @@
+(library
+  (public_name notty.unix)
+  (synopsis "Notty Unix IO")
+  (name notty_unix)
+  (wrapped false)
+  (c_names winsize)
+  (c_flags (-Wall -Wextra -O3))
+  (optional)
+  (libraries notty unix))
+
+(include_subdirs unqualified)

src/dune

@@ -0,0 +1,18 @@
+(library
+  (public_name notty)
+  (synopsis "Declaring terminals")
+  (libraries uchar uuseg uutf)
+  (wrapped false)
+  (modules notty))
+
+(library
+  (public_name notty.top)
+  (synopsis "Notty toplevel support")
+  (name notty_top)
+  (wrapped false)
+  (modules notty_top)
+  (libraries notty compiler-libs.toplevel))
+
+(install
+  (section lib)
+  (files (notty_top_init.ml as top/notty_top_init.ml)))