From b4e0c04368715622694c682a11f6036ec3c40f2d Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Sun, 25 Feb 2018 19:34:54 +0700
Subject: [PATCH] Revert "Use _utop.ml to avoid creating a separate dir for
 utop rules"

This reverts commit 9ec894eda01c1f681bc833eb4ef554402f909270.
---
 src/utop.ml                               | 14 ++++++++------
 test/blackbox-tests/test-cases/utop/run.t |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/utop.ml b/src/utop.ml
index bb9affdb..58aaddb6 100644
--- a/src/utop.ml
+++ b/src/utop.ml
@@ -3,8 +3,8 @@ open Jbuild
 open Build.O
 open! No_io
 
-let exe_name = "_utop"
-let main_module_name = "Utop"
+let exe_name = "utop"
+let main_module_name = String.capitalize_ascii exe_name
 let main_module_filename = exe_name ^ ".ml"
 
 let pp_ml fmt include_dirs =
@@ -36,8 +36,10 @@ let add_module_rules sctx ~dir lib_requires =
     >>> Build.write_file_dyn path in
   Super_context.add_rule sctx utop_ml
 
+let utop_exe_dir ~dir = Path.relative dir ".utop"
+
 let utop_exe dir =
-  Path.relative dir exe_name
+  Path.relative (utop_exe_dir ~dir) exe_name
   (* Use the [.exe] version. As the utop executable is declared with
      [(modes (byte))], the [.exe] correspond the bytecode linked in
      custom mode. We do that so that it works without hassle when
@@ -60,10 +62,11 @@ let setup sctx ~dir ~(libs : Library.t list) ~scope =
                       }
         ; intf = None
         ; obj_name = "" } in
+    let utop_exe_dir = utop_exe_dir ~dir in
     let _obj_dir, libs =
       Exe.build_and_link sctx
         ~loc
-        ~dir
+        ~dir:utop_exe_dir
         ~program:{ name = exe_name ; main_module_name }
         ~modules
         ~scope
@@ -73,7 +76,6 @@ let setup sctx ~dir ~(libs : Library.t list) ~scope =
           (List.map ~f:(fun (lib : Library.t) ->
              Lib_dep.direct lib.name) libs)
         )
-        ~flags:(Ocaml_flags.append_common (Ocaml_flags.default ()) ["-w"; "-24"])
         ~link_flags:(Build.return ["-linkall"; "-warn-error"; "-31"])
     in
-    add_module_rules sctx ~dir libs
+    add_module_rules sctx ~dir:utop_exe_dir libs
diff --git a/test/blackbox-tests/test-cases/utop/run.t b/test/blackbox-tests/test-cases/utop/run.t
index 91a6caf9..28535726 100644
--- a/test/blackbox-tests/test-cases/utop/run.t
+++ b/test/blackbox-tests/test-cases/utop/run.t
@@ -1,8 +1,8 @@
   $ $JBUILDER utop -j1 --display short --root . forutop -- init_forutop.ml
-      ocamldep forutop/_utop.ml.d
+      ocamldep forutop/.utop/utop.ml.d
       ocamldep forutop/forutop.ml.d
         ocamlc forutop/.forutop.objs/forutop.{cmi,cmo,cmt}
-        ocamlc forutop/._utop.eobjs/_utop.{cmi,cmo,cmt}
+        ocamlc forutop/.utop/.utop.eobjs/utop.{cmi,cmo,cmt}
         ocamlc forutop/forutop.cma
-        ocamlc forutop/_utop.exe
+        ocamlc forutop/.utop/utop.exe
   hello in utop