Merge pull request #221 from rgrinberg/4.06.0-and-safe-string

4.06.0 and safe string

.travis.yml

@@ -9,6 +9,8 @@ env:
   - OCAML_VERSION=4.02
   - OCAML_VERSION=4.03
   - OCAML_VERSION=4.04
+  - OCAML_VERSION=4.05
+  - OCAML_VERSION=4.06
 os:
   - linux
   - osx

examples/custom-utop/jbuild

@@ -2,5 +2,6 @@
 
 (executable
  ((name myutop)
+  (flags (:standard -safe-string))
   (link_flags (-linkall))
   (libraries (utop))))

examples/interact/jbuild

@@ -2,5 +2,6 @@
 
 (executable
  ((name test_program)
+  (flags (:standard -safe-string))
   (link_flags (-linkall))
   (libraries (utop))))

jbuild-workspace.dev

@@ -1,7 +1,6 @@
 ;; This file is used by `make all-supported-ocaml-versions`
 (context ((switch 4.02.3)))
 (context ((switch 4.03.0)))
-(context ((switch 4.04.1)))
+(context ((switch 4.04.2)))
-(context ((switch 4.05.0+trunk)))
+(context ((switch 4.05.0)))
-;; 4.06 support is broken for now
+(context ((switch 4.06.0)))
-;; (context ((switch 4.06.0+trunk)))

src/lib/jbuild

@@ -4,6 +4,7 @@
  ((name uTop)
   (public_name utop)
   (wrapped false)
+  (flags (:standard -safe-string))
   (modes (byte))
   (libraries (compiler-libs.toplevel findlib.top lambda-term threads))
   (preprocess (action (run ${bin:cppo} -V OCAML:${ocaml_version} ${<})))))

src/lib/uTop.ml

@@ -180,7 +180,10 @@ let discard_formatters pps f =
   (* Output functions. *)
   let out_functions = {
     Format.out_string = (fun _ _ _ -> ()); out_flush = ignore;
-    out_newline = ignore; out_spaces = ignore;
+    out_newline = ignore; out_spaces = ignore
+#if OCAML_VERSION >= (4, 06, 0)
+      ; out_indent = ignore
+#endif
   } in
   (* Replace formatter functions. *)
   List.iter (fun pp -> Format.pp_set_formatter_out_functions pp out_functions) pps;

src/top/expunge/jbuild

@@ -2,4 +2,5 @@
 
 (executable
  ((name expunge)
+  (flags (:standard -safe-string))
   (libraries (unix))))

src/top/jbuild

@@ -3,6 +3,7 @@
 (executables
  ((names (utop))
   (libraries (utop))
+  (flags (:standard -safe-string))
   (link_flags (-linkall))))
 
 (rule

utop.descr

@@ -1,6 +1,5 @@
 Universal toplevel for OCaml
-utop is an improved toplevel for OCaml. It can run in a terminal or in
-Emacs. It supports line edition, history, real-time and context
-sensitive completion, colors, and more.
 
-It integrates with the tuareg mode in Emacs.
+utop is an improved toplevel for OCaml. It can run in a terminal or in Emacs. It
+supports line edition, history, real-time and context sensitive completion,
+colors, and more. It integrates with the tuareg mode in Emacs.

utop.opam

@@ -15,9 +15,11 @@ depends: [
   "ocamlfind"    {>= "1.7.2"}
   "lambda-term"  {>= "1.2"}
   "lwt"
+  "lwt_react"
   "camomile"
   "react"        {>= "1.0.0"}
   "cppo"         {build & >= "1.1.2"}
   "jbuilder"     {build & >= "1.0+beta9"}
 ]
-available: [ ocaml-version >= "4.02.3" & ocaml-version < "4.06.0"]
+build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+available: [ocaml-version >= "4.02.3"]