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

Fix interpretation of (alias ...) and (alias_rec ...)

This commit is contained in:
Jeremie Dimino 2017-09-29 17:08:28 +01:00 committed by Rudi Grinberg
parent b69a6432dd
commit ed55ca9efe
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/alias.mli
View File

@ -2,6 +2,8 @@ type t
val make : string -> dir:Path.t -> t
val of_path : Path.t -> t
(** The following always holds:
{[

7
src/super_context.ml
View File

@ -406,17 +406,20 @@ module Deps = struct
open Build.O
open Dep_conf
let make_alias t ~scope ~dir s =
Alias.of_path (Path.relative dir (expand_vars t ~scope ~dir s))
let dep t ~scope ~dir = function
| File s ->
let path = Path.relative dir (expand_vars t ~scope ~dir s) in
Build.path path
>>^ fun () -> [path]
| Alias s ->
Alias.dep (Alias.make ~dir (expand_vars t ~scope ~dir s))
Alias.dep (make_alias t ~scope ~dir s)
>>^ fun () -> []
| Alias_rec s ->
Alias.dep_rec ~loc:(String_with_vars.loc s) ~file_tree:t.file_tree
(Alias.make ~dir (expand_vars t ~scope ~dir s))
(make_alias t ~scope ~dir s)
>>^ fun () -> []
| Glob_files s -> begin
let path = Path.relative dir (expand_vars t ~scope ~dir s) in