rel prep

CHANGES.md

@@ -1,3 +1,7 @@
+## v0.2.2 (2019-02-19)
+
+* Fix a long-standing terminal cleanup bug. Reported by @ttamttam, fix by @cfcs.
+
 ## v0.2.1 (2017-11-06)
 
 * OCaml 4.06 compatible.

README.md

@@ -7,7 +7,7 @@
 
 Notty is a declarative terminal library for OCaml structured around a notion
 of composable images. It tries to abstract away the basic terminal programming
-model, providing a simpler and a more expressive one.
+model, providing something simpler and more expressive.
 
 The core layout engine and IO codecs are pure platform-independent OCaml.
 Distribution includes modules with input and output facilities for Unix, and Lwt

_tags

@@ -15,8 +15,6 @@ true: package(uchar uucp uuseg uutf)
 <lwt>: include
 <lwt/*.ml{,i}>: package(lwt lwt.unix)
 
-<benchmarks/*>: use_notty_unix, package(unmark)
-
 <examples/*>: use_notty_unix, package(unix)
 <examples/{*_lwt,life,linear}*>: use_notty_lwt, package(lwt.unix)
 

build

@@ -1,2 +1,2 @@
 #!/bin/sh
-topkg build -- --with-unix true --with-lwt true --benchmarks true --examples true
+topkg build -- --with-unix true --with-lwt true --examples true

opam

@@ -1,17 +1,24 @@
-opam-version: "1.2"
+opam-version: "2.0"
 homepage:     "https://github.com/pqwy/notty"
-dev-repo:     "https://github.com/pqwy/notty.git"
+dev-repo:     "git+https://github.com/pqwy/notty.git"
 bug-reports:  "https://github.com/pqwy/notty/issues"
 doc:          "http://pqwy.github.io/notty/doc"
-author:       "David Kaloper <[email protected]>"
-maintainer:   "David Kaloper <[email protected]>"
+author:       "David Kaloper <[email protected]>"
+maintainer:   "David Kaloper <[email protected]>"
 license:      "ISC"
+synopsis:     "Declaring terminals"
+description:
+  "Notty is a declarative terminal library for OCaml structured around a notion
+  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" "--pinned" "%{pinned}%"
+  "ocaml" "pkg/pkg.ml" "build" "--dev-pkg" "%{dev}%"
           "--with-lwt" "%{lwt:installed}%"
 ]
 depends: [
+  "ocaml" { >= "4.05.0" }
   "ocamlbuild" {build}
   "ocamlfind" {build}
   "topkg" {build}
@@ -26,4 +33,3 @@ conflicts: [
   "ocb-stubblr" {<"0.1.0"}
   "lwt" {<"2.5.2"}
 ]
-available: [ ocaml-version >= "4.03.0" ]

pkg/pkg.ml

@@ -12,10 +12,11 @@ and ex    = Conf.(key ~doc:"Build examples" "examples" bool ~absent:false)
 let bin ?cond name = Pkg.test ~run:false ?cond name
   (* Pkg.bin ?cond ~dst:Fpath.("bin" // "notty." ^ basename name) name *)
 
+let opams = [ Pkg.opam_file "opam" ~lint_deps_excluding:(Some ["ocb-stubblr"]) ]
 let build = Pkg.build ~cmd:Ocb_stubblr_topkg.cmd ()
 
 let () =
-  Pkg.describe "notty" ~build @@ fun c ->
+  Pkg.describe "notty" ~build ~opams @@ fun c ->
     let unix = Conf.value c unix in
     let lwt = unix && Conf.value c lwt
     and speed = unix && Conf.value c speed