Rely on #use_command rather than installing a dune.top file

Signed-off-by: Jeremie Dimino <[email protected]>

bin/dune

@@ -23,17 +23,6 @@
  (files
   (dune.exe as dune)))
 
-(install
- (section lib_root)
- (package dune)
- (files
-  (dune.top as ocaml/dune.top)))
-
-(install
- (section toplevel)
- (package dune)
- (files dune.top))
-
 (deprecated_library_name
  (old_public_name dune.configurator)
  (new_public_name dune-configurator))

test/blackbox-tests/test-cases/toplevel-integration/run.t

@@ -21,7 +21,8 @@ Test toplevel-init-file on a tiny project
 
   $ ocaml -stdin <<EOF
   > #use "topfind";;
-  > #use "dune.top";;
+  > #use "use_output_compat";;
+  > #use_output "dune toplevel-init-file";;
   > Test.Main.hello ();;
   > EOF
   hello
@@ -39,10 +40,11 @@ Test toplevel-init-file on a tiny project
 
   $ ocaml -stdin <<EOF
   > #use "topfind";;
-  > #use "dune.top";;
+  > #use "use_output_compat";;
+  > #use_output "dune toplevel-init-file";;
   > EOF
   File "error.ml", line 1, characters 14-32:
   1 | let oops () = undefined_function ()
                     ^^^^^^^^^^^^^^^^^^
   Error: Unbound value undefined_function
-  Exception: AbnormalExit ("dune toplevel-init-file", 1).
+  Command exited with code 1.

test/blackbox-tests/test-cases/toplevel-integration/use_output_compat

@@ -0,0 +1,27 @@
+(* -*- tuareg -*- *)
+
+let try_finally ~always f =
+  match f () with
+  | x ->
+    always ();
+    x
+  | exception e ->
+    always ();
+    raise e
+
+let use_output command =
+  let fn = Filename.temp_file "ocaml" "_toploop.ml" in
+  try_finally
+    ~always:(fun () -> try Sys.remove fn with Sys_error _ -> ())
+    (fun () ->
+      match
+        Printf.ksprintf Sys.command "%s > %s" command (Filename.quote fn)
+      with
+      | 0 -> ignore (Toploop.use_file Format.std_formatter fn : bool)
+      | n -> Format.printf "Command exited with code %d.@." n)
+
+let () =
+  let name = "use_output" in
+  if not (Hashtbl.mem Toploop.directive_table name) then
+    Hashtbl.add Toploop.directive_table name
+      (Toploop.Directive_string use_output)