Move to hidden directory inside _build

This avoids the case of the name being picked up as build context

Signed-off-by: Marek Kubica <[email protected]>

Author: Leonidas-from-XIV

src/dune_pkg/lock_dir.ml

@@ -1783,7 +1783,7 @@ let loc_in_source_tree loc =
   |> Loc.map_pos ~f:(fun ({ pos_fname; _ } as pos) ->
     (* we're excluding the hidden dev-tools.locks folders in the build folder
        from rewriting  *)
-    match String.starts_with ~prefix:"_build/dev-tools.locks/" pos_fname with
+    match String.starts_with ~prefix:"_build/.dev-tools.locks/" pos_fname with
     | true -> pos
     | false ->
       let path = Path.of_string pos_fname in

src/dune_rules/lock_dir.ml

@@ -149,7 +149,7 @@ let dev_tool_to_path_segment dev_tool =
 
 let dev_tool_source_lock_dir dev_tool =
   let dev_tools_path =
-    Path.Source.L.relative Path.Source.root [ "_build"; "dev-tools.locks" ]
+    Path.Source.L.relative Path.Source.root [ "_build"; ".dev-tools.locks" ]
   in
   let dev_tool_segment = dev_tool_to_path_segment dev_tool in
   Path.Source.append_local dev_tools_path dev_tool_segment

src/dune_rules/pkg_rules.ml

@@ -1494,10 +1494,10 @@ end = struct
             in
             resolve db dep_loc dep_pkg_digest package_universe)
       and+ files_dir =
-        let* lock_dir =
+        let+ lock_dir =
           Package_universe.lock_dir_path package_universe >>| Option.value_exn
         in
-        let+ files_dir =
+        let files_dir =
           let module Pkg = Dune_pkg.Lock_dir.Pkg in
           (* TODO(steve): simplify this once portable lockdirs become the
              default. This logic currently handles both the cases where
@@ -1509,17 +1509,15 @@ end = struct
           let path_with_version =
             Pkg.source_files_dir info.name (Some info.version) ~lock_dir
           in
-          let* path_with_version_exists =
-            Fs_memo.dir_exists (Path.Outside_build_dir.In_source_dir path_with_version)
+          let path_with_version_exists =
+            Path.Untracked.exists (Path.source path_with_version)
           in
           match path_with_version_exists with
-          | true ->
-            Memo.return @@ Some (Pkg.files_dir info.name (Some info.version) ~lock_dir)
+          | true -> Some (Pkg.files_dir info.name (Some info.version) ~lock_dir)
           | false ->
             let path_without_version = Pkg.source_files_dir info.name None ~lock_dir in
-            let+ path_without_version_exists =
-              Fs_memo.dir_exists
-                (Path.Outside_build_dir.In_source_dir path_without_version)
+            let path_without_version_exists =
+              Path.Untracked.exists (Path.source path_without_version)
             in
             (match path_without_version_exists with
              | true -> Some (Pkg.files_dir info.name None ~lock_dir)
@@ -1533,18 +1531,23 @@ end = struct
               "Package files directory is external source directory, this is unsupported"
               [ "dir", Path.External.to_dyn e ]
           | In_source_tree s ->
+            (* TODO this probably never happens now *)
             (match Path.Source.explode s with
-             | [ "_build"; "dev-tools.locks"; dev_tool; files_dir ] ->
+             | [ "_build"; ".dev-tools.locks"; dev_tool; files_dir ] ->
                Path.Build.L.relative
                  Private_context.t.build_dir
                  [ "default"; ".dev-tool-locks"; dev_tool; files_dir ]
              | otherwise ->
                Code_error.raise
                  "Unexpected files_dir path"
                  [ "components", (Dyn.list Dyn.string) otherwise ])
-          | In_build_dir b ->
-            (* it's already a build path, no need to do anything *)
-            b)
+          | In_build_dir b -> (
+            match Path.Build.explode b with
+            | [".dev-tools.locks"; dev_tool; files_dir] ->
+               Path.Build.L.relative
+                 Private_context.t.build_dir
+                 [ "default"; ".dev-tool-locks"; dev_tool; files_dir ]
+            | _otherwise -> b))
       in
       let id = Pkg.Id.gen () in
       let write_paths =

test/blackbox-tests/test-cases/pkg/ocamlformat/gh10991.t

@@ -19,7 +19,7 @@ Initial file:
   let () = print_endline "Hello, world"
 
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for _build/dev-tools.locks/ocamlformat:
+  Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.0.1
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml

test/blackbox-tests/test-cases/pkg/ocamlformat/gh11037.t

@@ -40,7 +40,7 @@ attempt to build the package "foo".
   $ cat foo.ml
   let () = print_endline "Hello, world"
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for _build/dev-tools.locks/ocamlformat:
+  Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.0.1
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml

test/blackbox-tests/test-cases/pkg/ocamlformat/helpers.sh

@@ -1,6 +1,6 @@
 . ../helpers.sh
 
-dev_tool_lock_dir="_build/dev-tools.locks/ocamlformat"
+dev_tool_lock_dir="_build/.dev-tools.locks/ocamlformat"
 
 make_fake_ocamlformat() {
   version=$1

test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-avoid-conflict-with-project.t

@@ -29,7 +29,7 @@ Add a fake executable in the PATH
 
 Build the OCamlFormat binary dev-tool
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for _build/dev-tools.locks/ocamlformat:
+  Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   File "dune", line 1, characters 0-0:
   Error: Files _build/default/dune and _build/default/.formatted/dune differ.

test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-avoid-taking-from-project-deps.t

@@ -45,7 +45,7 @@ Format using the dev-tools feature, it does not invoke the OCamlFormat binary fr
 the project dependencies (0.26.2) but instead builds and runs the OCamlFormat binary as a
 dev-tool (0.26.3).
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for _build/dev-tools.locks/ocamlformat:
+  Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.3
   File "foo.ml", line 1, characters 0-0:
   Error: Files _build/default/foo.ml and _build/default/.formatted/foo.ml

test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-deps-conflict-project-deps.t

@@ -94,7 +94,7 @@ It shows that the project uses printer.2.0
 Format foo.ml, "dune fmt" uses printer.1.0 instead. There is no conflict with different
 versions of the same dependency.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt --preview
-  Solution for _build/dev-tools.locks/ocamlformat:
+  Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.2
   - printer.1.0
   File "foo.ml", line 1, characters 0-0:

test/blackbox-tests/test-cases/pkg/ocamlformat/ocamlformat-dev-tool-fails-to-build.t

@@ -13,9 +13,9 @@ Make dune-project that uses the mocked dev-tool opam-reposiotry.
 
 It fails during the build because of missing OCamlFormat module.
   $ DUNE_CONFIG__LOCK_DEV_TOOL=enabled dune fmt
-  Solution for _build/dev-tools.locks/ocamlformat:
+  Solution for _build/.dev-tools.locks/ocamlformat:
   - ocamlformat.0.26.4
-  File "_build/dev-tools.locks/ocamlformat/ocamlformat.pkg", line 4, characters 6-10:
+  File "_build/.dev-tools.locks/ocamlformat/ocamlformat.pkg", line 4, characters 6-10:
   4 |  (run dune build -p %{pkg-self:name} @install))
             ^^^^
   Error: Logs for package ocamlformat