WIP dev tool file dir

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

Author: Leonidas-from-XIV

src/dune_rules/lock_rules.ml

@@ -18,19 +18,60 @@ let copy_lock_dir ~target ~lock_dir ~deps ~files =
          let suffix = Path.drop_prefix_exn src ~prefix:(Path.source lock_dir) in
          let dst = Path.Build.append_local target suffix in
          let parent = Path.Build.parent_exn dst in
+         Printf.eprintf "%s -> %s\n" (Path.to_string src) (Path.Build.to_string dst);
          Action.progn [ Action.mkdir parent; Action.copy src dst ])
        |> Action.concurrent
        |> Action.Full.make
        |> Action_builder.return)
   |> action_builder_with_dir_targets ~directory_targets:[ target ]
 ;;
 
+let files dir =
+  let rec recurse dir =
+    match Path.Untracked.readdir_unsorted_with_kinds dir with
+    | Ok entries ->
+      entries
+      |> List.fold_left
+           ~init:(Path.Set.empty, Path.Set.empty)
+           ~f:(fun (files, empty_directories) (entry, kind) ->
+             let path = Path.relative dir entry in
+             match (kind : Unix.file_kind) with
+             | S_REG ->
+               let files = Path.Set.add files path in
+               files, empty_directories
+             | S_DIR ->
+               let files', empty_directories' = recurse path in
+               (match Path.Set.is_empty files', Path.Set.is_empty empty_directories' with
+                | true, true ->
+                  let empty_directories = Path.Set.add empty_directories path in
+                  files, empty_directories
+                | _, _ ->
+                  let files = Path.Set.union files files' in
+                  let empty_directories =
+                    Path.Set.union empty_directories empty_directories'
+                  in
+                  files, empty_directories)
+             | _otherwise -> failwith "unsupported content")
+    | Error (ENOENT, _, _) -> Path.Set.empty, Path.Set.empty
+    | Error unix_error ->
+      User_error.raise
+        [ Pp.text "Failed to read dev-tool lock dir files"
+        ; Pp.text (Unix_error.Detailed.to_string_hum unix_error)
+        ]
+  in
+  let files, empty_directories = recurse dir in
+  Dep.Set.of_source_files ~files ~empty_directories, files
+;;
+
 let setup_copy_rules ~dir:target ~lock_dir =
-  let+ deps, files = Source_deps.files (Path.source lock_dir) in
+  Printf.eprintf "Setting up copy rules for %s\n" (Path.Source.to_string lock_dir);
+  let+ () = Memo.return () in
+  let deps, files = files (Path.source lock_dir) in
   let directory_targets, rules =
     match Path.Set.is_empty files with
     | true -> Path.Build.Map.empty, Rules.empty
     | false ->
+      Printf.eprintf "Files: %s\n" (Dyn.to_string (Path.Set.to_dyn files));
       let directory_targets = Path.Build.Map.singleton target Loc.none in
       let { Action_builder.With_targets.build; targets } =
         copy_lock_dir ~target ~lock_dir ~deps ~files

src/dune_rules/pkg_rules.ml

@@ -1541,13 +1541,13 @@ end = struct
                Code_error.raise
                  "Unexpected files_dir path"
                  [ "components", (Dyn.list Dyn.string) otherwise ])
-          | In_build_dir b -> (
-            match Path.Build.explode b with
-            | [".dev-tools.locks"; dev_tool; files_dir] ->
+          | 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))
+             | _otherwise -> b))
       in
       let id = Pkg.Id.gen () in
       let write_paths =