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

Fix #264

This commit is contained in:
Jeremie Dimino 2017-09-29 12:01:20 +01:00
parent 50cbbe2ac5
commit 30076e7d79
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/jbuild.ml
View File

@ -832,12 +832,13 @@ module Menhir = struct
Chdir
(S.virt_var __POS__ "ROOT",
Run (S.virt_text __POS__ "menhir",
[ S.virt_text __POS__ "--base"
; S.virt_text __POS__ merge_into
]
@ t.flags
@ (List.map ~f:mly t.modules))
)
List.concat
[ [ S.virt_text __POS__ "--base"
; S.virt_var __POS__ ("path-no-dep:" ^ merge_into)
]
; t.flags
; [ S.virt_var __POS__ "!^" ]
]))
; fallback = Not_possible
; loc
}]

19
test/blackbox-tests/test-cases/menhir/run.t
View File

@ -1,7 +1,18 @@
$ $JBUILDER build -j1 src/test.exe --root . --debug-dependency-path
ocamllex src/lexer1.ml
ocamllex src/lexer2.ml
menhir src/test_base.{ml,mli} (exit 1)
(cd _build/default && C:\OCaml64\home\dimin\.opam\4.05.0+mingw64c\bin\menhir.exe --base test_base --explain tokens.mly parser.mly)
Error: parser.mly: No such file or directory
[1]
menhir src/test_base.{ml,mli}
menhir src/test_menhir1.{ml,mli}
ocamldep src/test.depends.ocamldep-output
ocamldep src/test.dependsi.ocamldep-output
ocamlc src/test_menhir1.{cmi,cmti}
ocamlc src/test_base.{cmi,cmti}
ocamlopt src/test_menhir1.{cmx,o}
ocamlc src/lexer1.{cmi,cmo,cmt}
ocamlopt src/test_base.{cmx,o}
ocamlc src/lexer2.{cmi,cmo,cmt}
ocamlopt src/lexer1.{cmx,o}
ocamlopt src/lexer2.{cmx,o}
ocamlc src/test.{cmi,cmo,cmt}
ocamlopt src/test.{cmx,o}
ocamlopt src/test.exe