diff --git a/.ocamlformat b/.ocamlformat index e69de29..75b374d 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -0,0 +1,3 @@ +profile = default +version = 0.26.2 +no-parse-toplevel-phrases \ No newline at end of file diff --git a/dune b/dune index ddcb786..899200a 100644 --- a/dune +++ b/dune @@ -20,7 +20,7 @@ (libraries lwt store - memtrace + ;;memtrace glfw-ocaml tgls tgls.tgles2 diff --git a/dune-project b/dune-project index ad06708..7850ba8 100644 --- a/dune-project +++ b/dune-project @@ -1,2 +1,2 @@ -(lang dune 3.6) +(lang dune 3.15) (name oplevel) diff --git a/oplevel.ml b/oplevel.ml index 1e79d7a..aaf49c1 100644 --- a/oplevel.ml +++ b/oplevel.ml @@ -55,8 +55,7 @@ let main = Gl.clear_color 0.1 0.2 0.2 1.; - Memtrace.trace_if_requested (); - + (*Memtrace.trace_if_requested (); *) let ctx = Gv.create ~flags:Gv.CreateFlags.(antialias lor stencil_strokes) () in @@ -142,7 +141,8 @@ let main = in ignore - (Toploop.use_input out_ppf (String "#use \"topfind\";;\n#list;;")); + (Toploop.use_input out_ppf + (String "#use \"topfind\";;\n#list;;#require \"lwt\";;")); (* toplevel execution binding *) Ui.( update_bindings ui diff --git a/store.ml b/store.ml index 7cb8d75..be9fa6a 100644 --- a/store.ml +++ b/store.ml @@ -19,7 +19,7 @@ let test_populate () : t Lwt.t = let init_default upstream_url : Sync.db Lwt.t = S.Repo.v (Irmin_git.Conf.init "../rootstore") >>= fun repo -> - S.of_branch repo "lablgtk" >>= fun t -> + S.of_branch repo "ogui" >>= fun t -> S.remote upstream_url >>= fun upstream -> (* (try Sync.pull_exn t upstream `Set >>= fun _ -> Lwt.return_unit with Invalid_argument a ->