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

Name the intput file for action preprocessors 

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
Jeremie Dimino 2018-07-09 17:24:04 +01:00 committed by Rudi Grinberg
parent fa0ab5b4a4
commit 38c0d56ba8
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/dune-files.rst
View File

@ -1038,11 +1038,11 @@ the ``-pp`` or ``-ppx`` of the various OCaml tools.
Preprocessing with actions Preprocessing with actions
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
``<action>`` uses the same DSL as described in the `User actions`_ section, and ``<action>`` uses the same DSL as described in the `User actions`_
for the same reason given in that section, it will be executed from the root of section, and for the same reason given in that section, it will be
the current build context. It is expected to be an action that reads the file executed from the root of the current build context. It is expected to
given as only dependency and outputs the preprocessed file on its standard be an action that reads the file given as only dependency named
output. ``input-file`` and outputs the preprocessed file on its standard output.
More precisely, ``(preprocess (action <action>))`` acts as if More precisely, ``(preprocess (action <action>))`` acts as if
you had setup a rule for every file of the form: you had setup a rule for every file of the form:
@ -1055,7 +1055,7 @@ you had setup a rule for every file of the form:
(action (with-stdout-to %{@} (chdir %{root} <action>)))) (action (with-stdout-to %{@} (chdir %{root} <action>))))
The equivalent of a ``-pp <command>`` option passed to the OCaml compiler is The equivalent of a ``-pp <command>`` option passed to the OCaml compiler is
``(system "<command> %{<}")``. ``(system "<command> %{input-file}")``.
Preprocessing with ppx rewriters Preprocessing with ppx rewriters
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

5
src/preprocessing.ml
View File

@ -456,7 +456,8 @@ let lint_module sctx ~dir ~dep_kind ~lint ~lib_name ~scope ~dir_kind =
let src_path = Path.relative dir src.name in let src_path = Path.relative dir src.name in
add_alias src.name add_alias src.name
(Build.path src_path (Build.path src_path
>>^ (fun _ -> Jbuild.Bindings.singleton src_path) >>^ (fun _ ->
[Jbuild.Bindings.Named ("input-file", [src_path])])
>>> SC.Action.run sctx >>> SC.Action.run sctx
action action
~loc ~loc
@ -532,7 +533,7 @@ let make sctx ~dir ~dep_kind ~lint ~preprocess
(preprocessor_deps (preprocessor_deps
>>> >>>
Build.path src Build.path src
>>^ (fun _ -> Jbuild.Bindings.singleton src) >>^ (fun _ -> [Jbuild.Bindings.Named ("input-file", [src])])
>>> >>>
SC.Action.run sctx SC.Action.run sctx
(Redirect (Redirect

2
test/blackbox-tests/test-cases/preprocess-with-action/dune/dune
View File

@ -1,3 +1,3 @@
(test (test
(name test) (name test)
(preprocess (action (run pp/pp.exe %{first-dep})))) (preprocess (action (run pp/pp.exe %{input-file}))))

3
test/blackbox-tests/test-cases/preprocess-with-action/run.t
View File

@ -1,4 +1 @@
$ dune runtest $ dune runtest
File "dune/dune", line 3, characters 38-48:
Error: unknown variable "first-dep"
[1]