matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename files_recursively_in to source_tree (#899) 

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
Jérémie Dimino 2018-06-20 10:45:54 +01:00 committed by GitHub
parent e7e662e0bd
commit 94c921f9c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 96 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -78,6 +78,9 @@ next
- Add a `link_deps` field to executables, to specify link-time dependencies - Add a `link_deps` field to executables, to specify link-time dependencies
like version scripts. (#879, fix #852, @emillon) like version scripts. (#879, fix #852, @emillon)
- Rename `files_recursively_in` to `source_tree` to make it clearer it
doesn't include generated files (#899, fix #843, @diml)
1.0+beta20 (10/04/2018) 1.0+beta20 (10/04/2018)
----------------------- -----------------------

2
doc/jbuild.rst
View File

@ -1070,7 +1070,7 @@ syntax:
``(alias src/runtest)``, ``(alias src/foo/bar/runtest)``, ... ``(alias src/runtest)``, ``(alias src/foo/bar/runtest)``, ...
- ``(glob_files <glob>)``: depend on all files matched by ``<glob>``, see the - ``(glob_files <glob>)``: depend on all files matched by ``<glob>``, see the
:ref:`glob <glob>` for details :ref:`glob <glob>` for details
- ``(files_recursively_in <dir>)``: depend on all files in the subtree with root - ``(source_tree <dir>)``: depend on all source files in the subtree with root
``<dir>`` ``<dir>``
- ``(universe)``: depend on everything in the universe. This is for - ``(universe)``: depend on everything in the universe. This is for
cases where dependencies are too hard to specify. Note that Jbuilder cases where dependencies are too hard to specify. Note that Jbuilder

4
example/dune
View File

@ -3,7 +3,7 @@
(alias (alias
((name runtest) ((name runtest)
(deps ((package dune) (deps ((package dune)
(files_recursively_in sample-projects/hello_world))) (source_tree sample-projects/hello_world)))
(action (action
(chdir sample-projects/hello_world (chdir sample-projects/hello_world
(run ${exe:../test/blackbox-tests/cram.exe} -test run.t))))) (run ${exe:../test/blackbox-tests/cram.exe} -test run.t)))))
@ -11,7 +11,7 @@
(alias (alias
((name runtest) ((name runtest)
(deps ((package dune) (deps ((package dune)
(files_recursively_in sample-projects/with-configure-step))) (source_tree sample-projects/with-configure-step)))
(action (action
(chdir sample-projects/with-configure-step (chdir sample-projects/with-configure-step
(run ${exe:../test/blackbox-tests/cram.exe} -test run.t))))) (run ${exe:../test/blackbox-tests/cram.exe} -test run.t)))))

2
src/build.ml
View File

@ -186,7 +186,7 @@ let of_result_map ?targets res ~f =
let memoize name t = let memoize name t =
Memo { name; t; state = Unevaluated } Memo { name; t; state = Unevaluated }
let files_recursively_in ~dir ~file_tree = let source_tree ~dir ~file_tree =
let prefix_with, dir = let prefix_with, dir =
match Path.extract_build_context_dir dir with match Path.extract_build_context_dir dir with
| None -> (Path.root, dir) | None -> (Path.root, dir)

3
src/build.mli
View File

@ -61,10 +61,9 @@ val path_set : Path.Set.t -> ('a, 'a) t
of the action produced by the build arrow. *) of the action produced by the build arrow. *)
val paths_glob : loc:Loc.t -> dir:Path.t -> Re.re -> ('a, Path.Set.t) t val paths_glob : loc:Loc.t -> dir:Path.t -> Re.re -> ('a, Path.Set.t) t
(* CR-someday diml: rename to [source_files_recursively_in] *)
(** Compute the set of source of all files present in the sub-tree (** Compute the set of source of all files present in the sub-tree
starting at [dir] and record them as dependencies. *) starting at [dir] and record them as dependencies. *)
val files_recursively_in val source_tree
: dir:Path.t : dir:Path.t
-> file_tree:File_tree.t -> file_tree:File_tree.t
-> ('a, Path.Set.t) t -> ('a, Path.Set.t) t

23
src/jbuild.ml
View File

@ -218,7 +218,7 @@ module Dep_conf = struct
| Alias of String_with_vars.t | Alias of String_with_vars.t
| Alias_rec of String_with_vars.t | Alias_rec of String_with_vars.t
| Glob_files of String_with_vars.t | Glob_files of String_with_vars.t
| Files_recursively_in of String_with_vars.t | Source_tree of String_with_vars.t
| Package of String_with_vars.t | Package of String_with_vars.t
| Universe | Universe
@ -226,13 +226,18 @@ module Dep_conf = struct
let t = let t =
let sw = String_with_vars.t in let sw = String_with_vars.t in
sum sum
[ "file" , (sw >>| fun x -> File x) [ "file" , (sw >>| fun x -> File x)
; "alias" , (sw >>| fun x -> Alias x) ; "alias" , (sw >>| fun x -> Alias x)
; "alias_rec" , (sw >>| fun x -> Alias_rec x) ; "alias_rec" , (sw >>| fun x -> Alias_rec x)
; "glob_files" , (sw >>| fun x -> Glob_files x) ; "glob_files" , (sw >>| fun x -> Glob_files x)
; "files_recursively_in" , (sw >>| fun x -> Files_recursively_in x) ; "package" , (sw >>| fun x -> Package x)
; "package" , (sw >>| fun x -> Package x) ; "universe" , return Universe
; "universe" , return Universe ; "files_recursively_in",
(Syntax.renamed_in syntax (1, 0) ~to_:"source_tree" >>= fun () ->
sw >>| fun x -> Source_tree x)
; "source_tree",
(Syntax.since syntax (1, 0) >>= fun () ->
sw >>| fun x -> Source_tree x)
] ]
in in
peek raw >>= function peek raw >>= function
@ -252,7 +257,7 @@ module Dep_conf = struct
| Glob_files t -> | Glob_files t ->
List [Sexp.unsafe_atom_of_string "glob_files" ; List [Sexp.unsafe_atom_of_string "glob_files" ;
String_with_vars.sexp_of_t t] String_with_vars.sexp_of_t t]
| Files_recursively_in t -> | Source_tree t ->
List [Sexp.unsafe_atom_of_string "files_recursively_in" ; List [Sexp.unsafe_atom_of_string "files_recursively_in" ;
String_with_vars.sexp_of_t t] String_with_vars.sexp_of_t t]
| Package t -> | Package t ->

2
src/jbuild.mli
View File

@ -92,7 +92,7 @@ module Dep_conf : sig
| Alias of String_with_vars.t | Alias of String_with_vars.t
| Alias_rec of String_with_vars.t | Alias_rec of String_with_vars.t
| Glob_files of String_with_vars.t | Glob_files of String_with_vars.t
| Files_recursively_in of String_with_vars.t | Source_tree of String_with_vars.t
| Package of String_with_vars.t | Package of String_with_vars.t
| Universe | Universe

4
src/super_context.ml
View File

@ -511,9 +511,9 @@ module Deps = struct
| Error (_pos, msg) -> | Error (_pos, msg) ->
Loc.fail (String_with_vars.loc s) "invalid glob: %s" msg Loc.fail (String_with_vars.loc s) "invalid glob: %s" msg
end end
| Files_recursively_in s -> | Source_tree s ->
let path = expand_vars_path t ~scope ~dir s in let path = expand_vars_path t ~scope ~dir s in
Build.files_recursively_in ~dir:path ~file_tree:t.file_tree Build.source_tree ~dir:path ~file_tree:t.file_tree
>>^ Path.Set.to_list >>^ Path.Set.to_list
| Package p -> | Package p ->
let pkg = Package.Name.of_string (expand_vars t ~scope ~dir p) in let pkg = Package.Name.of_string (expand_vars t ~scope ~dir p) in

2
test/blackbox-tests/dune
View File

@ -21,7 +21,7 @@
(rule (rule
((targets (dune.inc.gen)) ((targets (dune.inc.gen))
(deps ((files_recursively_in test-cases))) (deps ((source_tree test-cases)))
(action (with-stdout-to ${@} (run ./gen_tests.exe))))) (action (with-stdout-to ${@} (run ./gen_tests.exe)))))
(alias (alias

143
test/blackbox-tests/dune.inc
View File

@ -1,6 +1,6 @@
(alias (alias
((name aliases) ((name aliases)
(deps ((package dune) (files_recursively_in test-cases/aliases))) (deps ((package dune) (source_tree test-cases/aliases)))
(action (action
(chdir (chdir
test-cases/aliases test-cases/aliases
@ -8,7 +8,7 @@
(alias (alias
((name bad-alias-error) ((name bad-alias-error)
(deps ((package dune) (files_recursively_in test-cases/bad-alias-error))) (deps ((package dune) (source_tree test-cases/bad-alias-error)))
(action (action
(chdir (chdir
test-cases/bad-alias-error test-cases/bad-alias-error
@ -16,7 +16,7 @@
(alias (alias
((name block-strings) ((name block-strings)
(deps ((package dune) (files_recursively_in test-cases/block-strings))) (deps ((package dune) (source_tree test-cases/block-strings)))
(action (action
(chdir (chdir
test-cases/block-strings test-cases/block-strings
@ -24,7 +24,7 @@
(alias (alias
((name byte-code-only) ((name byte-code-only)
(deps ((package dune) (files_recursively_in test-cases/byte-code-only))) (deps ((package dune) (source_tree test-cases/byte-code-only)))
(action (action
(chdir (chdir
test-cases/byte-code-only test-cases/byte-code-only
@ -32,7 +32,7 @@
(alias (alias
((name c-stubs) ((name c-stubs)
(deps ((package dune) (files_recursively_in test-cases/c-stubs))) (deps ((package dune) (source_tree test-cases/c-stubs)))
(action (action
(chdir (chdir
test-cases/c-stubs test-cases/c-stubs
@ -40,7 +40,7 @@
(alias (alias
((name configurator) ((name configurator)
(deps ((package dune) (files_recursively_in test-cases/configurator))) (deps ((package dune) (source_tree test-cases/configurator)))
(action (action
(chdir (chdir
test-cases/configurator test-cases/configurator
@ -50,7 +50,7 @@
(alias (alias
((name copy_files) ((name copy_files)
(deps ((package dune) (files_recursively_in test-cases/copy_files))) (deps ((package dune) (source_tree test-cases/copy_files)))
(action (action
(chdir (chdir
test-cases/copy_files test-cases/copy_files
@ -58,7 +58,7 @@
(alias (alias
((name cross-compilation) ((name cross-compilation)
(deps ((package dune) (files_recursively_in test-cases/cross-compilation))) (deps ((package dune) (source_tree test-cases/cross-compilation)))
(action (action
(chdir (chdir
test-cases/cross-compilation test-cases/cross-compilation
@ -66,7 +66,7 @@
(alias (alias
((name custom-build-dir) ((name custom-build-dir)
(deps ((package dune) (files_recursively_in test-cases/custom-build-dir))) (deps ((package dune) (source_tree test-cases/custom-build-dir)))
(action (action
(chdir (chdir
test-cases/custom-build-dir test-cases/custom-build-dir
@ -74,8 +74,7 @@
(alias (alias
((name depend-on-the-universe) ((name depend-on-the-universe)
(deps (deps ((package dune) (source_tree test-cases/depend-on-the-universe)))
((package dune) (files_recursively_in test-cases/depend-on-the-universe)))
(action (action
(chdir (chdir
test-cases/depend-on-the-universe test-cases/depend-on-the-universe
@ -83,8 +82,7 @@
(alias (alias
((name dune-ppx-driver-system) ((name dune-ppx-driver-system)
(deps (deps ((package dune) (source_tree test-cases/dune-ppx-driver-system)))
((package dune) (files_recursively_in test-cases/dune-ppx-driver-system)))
(action (action
(chdir (chdir
test-cases/dune-ppx-driver-system test-cases/dune-ppx-driver-system
@ -92,8 +90,7 @@
(alias (alias
((name dune-project-edition) ((name dune-project-edition)
(deps (deps ((package dune) (source_tree test-cases/dune-project-edition)))
((package dune) (files_recursively_in test-cases/dune-project-edition)))
(action (action
(chdir (chdir
test-cases/dune-project-edition test-cases/dune-project-edition
@ -101,7 +98,7 @@
(alias (alias
((name env) ((name env)
(deps ((package dune) (files_recursively_in test-cases/env))) (deps ((package dune) (source_tree test-cases/env)))
(action (action
(chdir (chdir
test-cases/env test-cases/env
@ -109,8 +106,7 @@
(alias (alias
((name exclude-missing-module) ((name exclude-missing-module)
(deps (deps ((package dune) (source_tree test-cases/exclude-missing-module)))
((package dune) (files_recursively_in test-cases/exclude-missing-module)))
(action (action
(chdir (chdir
test-cases/exclude-missing-module test-cases/exclude-missing-module
@ -118,7 +114,7 @@
(alias (alias
((name exec-cmd) ((name exec-cmd)
(deps ((package dune) (files_recursively_in test-cases/exec-cmd))) (deps ((package dune) (source_tree test-cases/exec-cmd)))
(action (action
(chdir (chdir
test-cases/exec-cmd test-cases/exec-cmd
@ -126,7 +122,7 @@
(alias (alias
((name findlib) ((name findlib)
(deps ((package dune) (files_recursively_in test-cases/findlib))) (deps ((package dune) (source_tree test-cases/findlib)))
(action (action
(chdir (chdir
test-cases/findlib test-cases/findlib
@ -134,7 +130,7 @@
(alias (alias
((name force-test) ((name force-test)
(deps ((package dune) (files_recursively_in test-cases/force-test))) (deps ((package dune) (source_tree test-cases/force-test)))
(action (action
(chdir (chdir
test-cases/force-test test-cases/force-test
@ -142,8 +138,7 @@
(alias (alias
((name gen-opam-install-file) ((name gen-opam-install-file)
(deps (deps ((package dune) (source_tree test-cases/gen-opam-install-file)))
((package dune) (files_recursively_in test-cases/gen-opam-install-file)))
(action (action
(chdir (chdir
test-cases/gen-opam-install-file test-cases/gen-opam-install-file
@ -151,7 +146,7 @@
(alias (alias
((name github20) ((name github20)
(deps ((package dune) (files_recursively_in test-cases/github20))) (deps ((package dune) (source_tree test-cases/github20)))
(action (action
(chdir (chdir
test-cases/github20 test-cases/github20
@ -159,7 +154,7 @@
(alias (alias
((name github24) ((name github24)
(deps ((package dune) (files_recursively_in test-cases/github24))) (deps ((package dune) (source_tree test-cases/github24)))
(action (action
(chdir (chdir
test-cases/github24 test-cases/github24
@ -167,7 +162,7 @@
(alias (alias
((name github25) ((name github25)
(deps ((package dune) (files_recursively_in test-cases/github25))) (deps ((package dune) (source_tree test-cases/github25)))
(action (action
(setenv (setenv
OCAMLPATH OCAMLPATH
@ -178,7 +173,7 @@
(alias (alias
((name github534) ((name github534)
(deps ((package dune) (files_recursively_in test-cases/github534))) (deps ((package dune) (source_tree test-cases/github534)))
(action (action
(chdir (chdir
test-cases/github534 test-cases/github534
@ -186,7 +181,7 @@
(alias (alias
((name github568) ((name github568)
(deps ((package dune) (files_recursively_in test-cases/github568))) (deps ((package dune) (source_tree test-cases/github568)))
(action (action
(chdir (chdir
test-cases/github568 test-cases/github568
@ -194,7 +189,7 @@
(alias (alias
((name github597) ((name github597)
(deps ((package dune) (files_recursively_in test-cases/github597))) (deps ((package dune) (source_tree test-cases/github597)))
(action (action
(chdir (chdir
test-cases/github597 test-cases/github597
@ -202,7 +197,7 @@
(alias (alias
((name github644) ((name github644)
(deps ((package dune) (files_recursively_in test-cases/github644))) (deps ((package dune) (source_tree test-cases/github644)))
(action (action
(chdir (chdir
test-cases/github644 test-cases/github644
@ -210,7 +205,7 @@
(alias (alias
((name github660) ((name github660)
(deps ((package dune) (files_recursively_in test-cases/github660))) (deps ((package dune) (source_tree test-cases/github660)))
(action (action
(chdir (chdir
test-cases/github660 test-cases/github660
@ -218,8 +213,7 @@
(alias (alias
((name github717-odoc-index) ((name github717-odoc-index)
(deps (deps ((package dune) (source_tree test-cases/github717-odoc-index)))
((package dune) (files_recursively_in test-cases/github717-odoc-index)))
(action (action
(chdir (chdir
test-cases/github717-odoc-index test-cases/github717-odoc-index
@ -229,7 +223,7 @@
(alias (alias
((name github734) ((name github734)
(deps ((package dune) (files_recursively_in test-cases/github734))) (deps ((package dune) (source_tree test-cases/github734)))
(action (action
(chdir (chdir
test-cases/github734 test-cases/github734
@ -237,7 +231,7 @@
(alias (alias
((name github759) ((name github759)
(deps ((package dune) (files_recursively_in test-cases/github759))) (deps ((package dune) (source_tree test-cases/github759)))
(action (action
(chdir (chdir
test-cases/github759 test-cases/github759
@ -245,7 +239,7 @@
(alias (alias
((name github761) ((name github761)
(deps ((package dune) (files_recursively_in test-cases/github761))) (deps ((package dune) (source_tree test-cases/github761)))
(action (action
(chdir (chdir
test-cases/github761 test-cases/github761
@ -253,7 +247,7 @@
(alias (alias
((name github764) ((name github764)
(deps ((package dune) (files_recursively_in test-cases/github764))) (deps ((package dune) (source_tree test-cases/github764)))
(action (action
(chdir (chdir
test-cases/github764 test-cases/github764
@ -263,7 +257,7 @@
(alias (alias
((name github784) ((name github784)
(deps ((package dune) (files_recursively_in test-cases/github784))) (deps ((package dune) (source_tree test-cases/github784)))
(action (action
(chdir (chdir
test-cases/github784 test-cases/github784
@ -271,7 +265,7 @@
(alias (alias
((name ignored_subdirs) ((name ignored_subdirs)
(deps ((package dune) (files_recursively_in test-cases/ignored_subdirs))) (deps ((package dune) (source_tree test-cases/ignored_subdirs)))
(action (action
(chdir (chdir
test-cases/ignored_subdirs test-cases/ignored_subdirs
@ -279,7 +273,7 @@
(alias (alias
((name include-loop) ((name include-loop)
(deps ((package dune) (files_recursively_in test-cases/include-loop))) (deps ((package dune) (source_tree test-cases/include-loop)))
(action (action
(chdir (chdir
test-cases/include-loop test-cases/include-loop
@ -287,7 +281,7 @@
(alias (alias
((name inline_tests) ((name inline_tests)
(deps ((package dune) (files_recursively_in test-cases/inline_tests))) (deps ((package dune) (source_tree test-cases/inline_tests)))
(action (action
(chdir (chdir
test-cases/inline_tests test-cases/inline_tests
@ -296,8 +290,7 @@
(alias (alias
((name installable-dup-private-libs) ((name installable-dup-private-libs)
(deps (deps
((package dune) ((package dune) (source_tree test-cases/installable-dup-private-libs)))
(files_recursively_in test-cases/installable-dup-private-libs)))
(action (action
(chdir (chdir
test-cases/installable-dup-private-libs test-cases/installable-dup-private-libs
@ -305,7 +298,7 @@
(alias (alias
((name intf-only) ((name intf-only)
(deps ((package dune) (files_recursively_in test-cases/intf-only))) (deps ((package dune) (source_tree test-cases/intf-only)))
(action (action
(chdir (chdir
test-cases/intf-only test-cases/intf-only
@ -313,7 +306,7 @@
(alias (alias
((name js_of_ocaml) ((name js_of_ocaml)
(deps ((package dune) (files_recursively_in test-cases/js_of_ocaml))) (deps ((package dune) (source_tree test-cases/js_of_ocaml)))
(action (action
(setenv (setenv
NODE NODE
@ -324,7 +317,7 @@
(alias (alias
((name lib-available) ((name lib-available)
(deps ((package dune) (files_recursively_in test-cases/lib-available))) (deps ((package dune) (source_tree test-cases/lib-available)))
(action (action
(chdir (chdir
test-cases/lib-available test-cases/lib-available
@ -332,7 +325,7 @@
(alias (alias
((name link-deps) ((name link-deps)
(deps ((package dune) (files_recursively_in test-cases/link-deps))) (deps ((package dune) (source_tree test-cases/link-deps)))
(action (action
(chdir (chdir
test-cases/link-deps test-cases/link-deps
@ -340,7 +333,7 @@
(alias (alias
((name loop) ((name loop)
(deps ((package dune) (files_recursively_in test-cases/loop))) (deps ((package dune) (source_tree test-cases/loop)))
(action (action
(chdir (chdir
test-cases/loop test-cases/loop
@ -348,7 +341,7 @@
(alias (alias
((name menhir) ((name menhir)
(deps ((package dune) (files_recursively_in test-cases/menhir))) (deps ((package dune) (source_tree test-cases/menhir)))
(action (action
(chdir (chdir
test-cases/menhir test-cases/menhir
@ -356,7 +349,7 @@
(alias (alias
((name merlin-tests) ((name merlin-tests)
(deps ((package dune) (files_recursively_in test-cases/merlin-tests))) (deps ((package dune) (source_tree test-cases/merlin-tests)))
(action (action
(chdir (chdir
test-cases/merlin-tests test-cases/merlin-tests
@ -364,7 +357,7 @@
(alias (alias
((name meta-gen) ((name meta-gen)
(deps ((package dune) (files_recursively_in test-cases/meta-gen))) (deps ((package dune) (source_tree test-cases/meta-gen)))
(action (action
(chdir (chdir
test-cases/meta-gen test-cases/meta-gen
@ -372,7 +365,7 @@
(alias (alias
((name misc) ((name misc)
(deps ((package dune) (files_recursively_in test-cases/misc))) (deps ((package dune) (source_tree test-cases/misc)))
(action (action
(chdir (chdir
test-cases/misc test-cases/misc
@ -380,8 +373,7 @@
(alias (alias
((name multiple-private-libs) ((name multiple-private-libs)
(deps (deps ((package dune) (source_tree test-cases/multiple-private-libs)))
((package dune) (files_recursively_in test-cases/multiple-private-libs)))
(action (action
(chdir (chdir
test-cases/multiple-private-libs test-cases/multiple-private-libs
@ -391,8 +383,7 @@
(alias (alias
((name no-installable-mode) ((name no-installable-mode)
(deps (deps ((package dune) (source_tree test-cases/no-installable-mode)))
((package dune) (files_recursively_in test-cases/no-installable-mode)))
(action (action
(chdir (chdir
test-cases/no-installable-mode test-cases/no-installable-mode
@ -400,7 +391,7 @@
(alias (alias
((name null-dep) ((name null-dep)
(deps ((package dune) (files_recursively_in test-cases/null-dep))) (deps ((package dune) (source_tree test-cases/null-dep)))
(action (action
(chdir (chdir
test-cases/null-dep test-cases/null-dep
@ -408,7 +399,7 @@
(alias (alias
((name ocaml-syntax) ((name ocaml-syntax)
(deps ((package dune) (files_recursively_in test-cases/ocaml-syntax))) (deps ((package dune) (source_tree test-cases/ocaml-syntax)))
(action (action
(chdir (chdir
test-cases/ocaml-syntax test-cases/ocaml-syntax
@ -416,8 +407,7 @@
(alias (alias
((name ocamldep-multi-stanzas) ((name ocamldep-multi-stanzas)
(deps (deps ((package dune) (source_tree test-cases/ocamldep-multi-stanzas)))
((package dune) (files_recursively_in test-cases/ocamldep-multi-stanzas)))
(action (action
(chdir (chdir
test-cases/ocamldep-multi-stanzas test-cases/ocamldep-multi-stanzas
@ -425,7 +415,7 @@
(alias (alias
((name odoc) ((name odoc)
(deps ((package dune) (files_recursively_in test-cases/odoc))) (deps ((package dune) (source_tree test-cases/odoc)))
(action (action
(chdir (chdir
test-cases/odoc test-cases/odoc
@ -435,7 +425,7 @@
(alias (alias
((name odoc-unique-mlds) ((name odoc-unique-mlds)
(deps ((package dune) (files_recursively_in test-cases/odoc-unique-mlds))) (deps ((package dune) (source_tree test-cases/odoc-unique-mlds)))
(action (action
(chdir (chdir
test-cases/odoc-unique-mlds test-cases/odoc-unique-mlds
@ -445,7 +435,7 @@
(alias (alias
((name output-obj) ((name output-obj)
(deps ((package dune) (files_recursively_in test-cases/output-obj))) (deps ((package dune) (source_tree test-cases/output-obj)))
(action (action
(chdir (chdir
test-cases/output-obj test-cases/output-obj
@ -462,7 +452,7 @@
(alias (alias
((name package-dep) ((name package-dep)
(deps ((package dune) (files_recursively_in test-cases/package-dep))) (deps ((package dune) (source_tree test-cases/package-dep)))
(action (action
(chdir (chdir
test-cases/package-dep test-cases/package-dep
@ -470,7 +460,7 @@
(alias (alias
((name ppx-rewriter) ((name ppx-rewriter)
(deps ((package dune) (files_recursively_in test-cases/ppx-rewriter))) (deps ((package dune) (source_tree test-cases/ppx-rewriter)))
(action (action
(chdir (chdir
test-cases/ppx-rewriter test-cases/ppx-rewriter
@ -480,8 +470,7 @@
(alias (alias
((name private-public-overlap) ((name private-public-overlap)
(deps (deps ((package dune) (source_tree test-cases/private-public-overlap)))
((package dune) (files_recursively_in test-cases/private-public-overlap)))
(action (action
(chdir (chdir
test-cases/private-public-overlap test-cases/private-public-overlap
@ -489,7 +478,7 @@
(alias (alias
((name promote) ((name promote)
(deps ((package dune) (files_recursively_in test-cases/promote))) (deps ((package dune) (source_tree test-cases/promote)))
(action (action
(chdir (chdir
test-cases/promote test-cases/promote
@ -497,7 +486,7 @@
(alias (alias
((name quoting) ((name quoting)
(deps ((package dune) (files_recursively_in test-cases/quoting))) (deps ((package dune) (source_tree test-cases/quoting)))
(action (action
(chdir (chdir
test-cases/quoting test-cases/quoting
@ -505,7 +494,7 @@
(alias (alias
((name reason) ((name reason)
(deps ((package dune) (files_recursively_in test-cases/reason))) (deps ((package dune) (source_tree test-cases/reason)))
(action (action
(chdir (chdir
test-cases/reason test-cases/reason
@ -513,7 +502,7 @@
(alias (alias
((name redirections) ((name redirections)
(deps ((package dune) (files_recursively_in test-cases/redirections))) (deps ((package dune) (source_tree test-cases/redirections)))
(action (action
(chdir (chdir
test-cases/redirections test-cases/redirections
@ -521,7 +510,7 @@
(alias (alias
((name scope-bug) ((name scope-bug)
(deps ((package dune) (files_recursively_in test-cases/scope-bug))) (deps ((package dune) (source_tree test-cases/scope-bug)))
(action (action
(chdir (chdir
test-cases/scope-bug test-cases/scope-bug
@ -529,7 +518,7 @@
(alias (alias
((name scope-ppx-bug) ((name scope-ppx-bug)
(deps ((package dune) (files_recursively_in test-cases/scope-ppx-bug))) (deps ((package dune) (source_tree test-cases/scope-ppx-bug)))
(action (action
(chdir (chdir
test-cases/scope-ppx-bug test-cases/scope-ppx-bug
@ -537,7 +526,7 @@
(alias (alias
((name select) ((name select)
(deps ((package dune) (files_recursively_in test-cases/select))) (deps ((package dune) (source_tree test-cases/select)))
(action (action
(chdir (chdir
test-cases/select test-cases/select
@ -545,7 +534,7 @@
(alias (alias
((name syntax-versioning) ((name syntax-versioning)
(deps ((package dune) (files_recursively_in test-cases/syntax-versioning))) (deps ((package dune) (source_tree test-cases/syntax-versioning)))
(action (action
(chdir (chdir
test-cases/syntax-versioning test-cases/syntax-versioning
@ -553,7 +542,7 @@
(alias (alias
((name use-meta) ((name use-meta)
(deps ((package dune) (files_recursively_in test-cases/use-meta))) (deps ((package dune) (source_tree test-cases/use-meta)))
(action (action
(chdir (chdir
test-cases/use-meta test-cases/use-meta
@ -561,7 +550,7 @@
(alias (alias
((name utop) ((name utop)
(deps ((package dune) (files_recursively_in test-cases/utop))) (deps ((package dune) (source_tree test-cases/utop)))
(action (action
(chdir (chdir
test-cases/utop test-cases/utop

2
test/blackbox-tests/gen_tests.ml
View File

@ -80,7 +80,7 @@ module Test = struct
alias t.name alias t.name
~deps:( ~deps:(
[ Sexp.strings ["package"; "dune"] [ Sexp.strings ["package"; "dune"]
; Sexp.strings [ "files_recursively_in" ; Sexp.strings [ "source_tree"
; sprintf "test-cases/%s" t.name] ; sprintf "test-cases/%s" t.name]
] ]
) ~action ) ~action

2
test/blackbox-tests/test-cases/misc/dune
View File

@ -9,7 +9,7 @@
(rule (rule
((targets (result2 expected2)) ((targets (result2 expected2))
(deps ((files_recursively_in sub-tree))) (deps ((source_tree sub-tree)))
(action (progn (action (progn
(with-stdout-to result2 (echo ${^})) (with-stdout-to result2 (echo ${^}))
(with-stdout-to expected2 (echo "sub-tree/a sub-tree/dir/b")))))) (with-stdout-to expected2 (echo "sub-tree/a sub-tree/dir/b"))))))

4
test/unit-tests/dune
View File

@ -21,8 +21,8 @@
(deps (tests.mlt (deps (tests.mlt
(glob_files ${SCOPE_ROOT}/src/.dune.objs/*.cmi) (glob_files ${SCOPE_ROOT}/src/.dune.objs/*.cmi)
(glob_files ${SCOPE_ROOT}/src/stdune/.stdune.objs/*.cmi) (glob_files ${SCOPE_ROOT}/src/stdune/.stdune.objs/*.cmi)
(files_recursively_in toolchain.d) (source_tree toolchain.d)
(files_recursively_in findlib-db))) (source_tree findlib-db)))
(action (chdir ${SCOPE_ROOT} (action (chdir ${SCOPE_ROOT}
(progn (progn
(run ${exe:expect_test.exe} ${<}) (run ${exe:expect_test.exe} ${<})