Go back to Dsexp for taking hash for stamp
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
parent
ca6e7c04bd
commit
59a0c57710
|
@ -1621,7 +1621,7 @@ module Alias = struct
|
|||
|
||||
let add_action build_system t ~context ~loc ?(locks=[]) ~stamp action =
|
||||
let def = get_alias_def build_system t in
|
||||
def.actions <- { stamp = Digest.string (Sexp.to_string stamp)
|
||||
def.actions <- { stamp = Digest.string (Dsexp.to_string ~syntax:Dune stamp)
|
||||
; action
|
||||
; locks
|
||||
; context
|
||||
|
|
|
@ -174,7 +174,7 @@ module Alias : sig
|
|||
-> context:Context.t
|
||||
-> loc:Loc.t option
|
||||
-> ?locks:Path.t list
|
||||
-> stamp:Sexp.t
|
||||
-> stamp:Dsexp.t
|
||||
-> (unit, Action.t) Build.t
|
||||
-> unit
|
||||
end with type build_system := t
|
||||
|
|
|
@ -261,8 +261,8 @@ include Sub_system.Register_end_point(
|
|||
SC.add_alias_action sctx
|
||||
~loc:(Some info.loc)
|
||||
(Build_system.Alias.runtest ~dir)
|
||||
~stamp:(List [ Sexp.Atom "ppx-runner"
|
||||
; Atom name
|
||||
~stamp:(List [ Dsexp.unsafe_atom_of_string "ppx-runner"
|
||||
; Quoted_string name
|
||||
])
|
||||
(let module A = Action in
|
||||
let exe = Path.relative inline_test_dir (name ^ ".exe") in
|
||||
|
|
|
@ -463,9 +463,9 @@ let lint_module sctx ~dir ~dep_kind ~lint ~lib_name ~scope ~dir_kind =
|
|||
let alias = Build_system.Alias.lint ~dir in
|
||||
let add_alias fn build =
|
||||
SC.add_alias_action sctx alias build
|
||||
~stamp:(List [ Sexp.Atom "lint"
|
||||
; Sexp.To_sexp.(option string) lib_name
|
||||
; Path.sexp_of_t fn
|
||||
~stamp:(List [ Dsexp.unsafe_atom_of_string "lint"
|
||||
; Dsexp.To_sexp.(option string) lib_name
|
||||
; Path_dsexp.dgen fn
|
||||
])
|
||||
in
|
||||
let lint =
|
||||
|
|
|
@ -90,10 +90,10 @@ let alias sctx ~dir ~scope (alias_conf : Alias_conf.t) =
|
|||
Blang.eval_bool blang ~dir ~f
|
||||
in
|
||||
let stamp =
|
||||
Sexp.List
|
||||
[ Sexp.Atom "user-alias"
|
||||
; Dune_file.Bindings.sexp_of_t Dune_file.Dep_conf.sexp_of_t alias_conf.deps
|
||||
; Sexp.To_sexp.option Action.Unexpanded.sexp_of_t
|
||||
Dsexp.List
|
||||
[ Dsexp.unsafe_atom_of_string "user-alias"
|
||||
; Dune_file.Bindings.dgen Dune_file.Dep_conf.dgen alias_conf.deps
|
||||
; Dsexp.To_sexp.option Action.Unexpanded.dgen
|
||||
(Option.map alias_conf.action ~f:snd)
|
||||
]
|
||||
in
|
||||
|
|
|
@ -151,7 +151,7 @@ val add_alias_action
|
|||
-> Build_system.Alias.t
|
||||
-> loc:Loc.t option
|
||||
-> ?locks:Path.t list
|
||||
-> stamp:Sexp.t
|
||||
-> stamp:Dsexp.t
|
||||
-> (unit, Action.t) Build.t
|
||||
-> unit
|
||||
|
||||
|
|
Loading…
Reference in New Issue