Add dune-project files to dune tests and remove old jbuild_version stanzas (#875)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
Jérémie Dimino
GitHub
parent
8727eb6c3c
commit
3cf2a0dab1
2
doc/dune
2
doc/dune
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(rule
|
||||
((targets (dune.1))
|
||||
(action (with-stdout-to ${@}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(ignored_subdirs (sample-projects))
|
||||
|
||||
(alias
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executables
|
||||
((names (main))
|
||||
(libraries (hello_world))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name hello_world)
|
||||
(public_name hello_world)))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(rule
|
||||
((targets (hello_world.output))
|
||||
(action (with-stdout-to ${@} (run ${bin:hello_world})))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(rule
|
||||
((fallback)
|
||||
(targets (config))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executables
|
||||
((names (plop))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(ignored_subdirs (test-cases))
|
||||
|
||||
(library
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name just-in-src)
|
||||
(deps ((alias src/x)))))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name x)
|
||||
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name x)
|
||||
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name x)
|
||||
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1 +0,0 @@
|
|||
(jbuild_version 1)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name q)
|
||||
(c_names (q_stub))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name run)
|
||||
(libraries (q))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name run)
|
||||
(libraries (dune.configurator))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name run)
|
||||
(libraries (dune.configurator))))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name run)
|
||||
(libraries (dune.configurator))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(copy_files# lexers/*.ml{,i})
|
||||
(copy_files# include/bar.h)
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,3 +1 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(ocamllex (lexer1))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name blah)
|
||||
(public_name blah)
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(rule (with-stdout-to file (run ./bin/blah.exe)))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name p)
|
||||
(public_name p)))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((modules (foo))
|
||||
(name foo)))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name f)))
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name foo)
|
||||
(modules (foo))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,4 +1,2 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name foo)))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
|
||||
(library
|
||||
((name lib1)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name runtest)
|
||||
(deps (main.exe))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name runtest)
|
||||
(deps (main.exe))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name hello_world)
|
||||
(public_name hello_world)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
$ mkdir symlink-outside-root
|
||||
$ cd symlink-outside-root && ln -s ../sample-exe sample
|
||||
$ cd symlink-outside-root && echo "(lang dune 1.0)" > dune-project
|
||||
$ cd symlink-outside-root && jbuilder exec --root . -- sample/foo.exe
|
||||
foo
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,2 +1 @@
|
|||
(jbuild_version 1)
|
||||
(include b.inc)
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
(jbuild_version 1)
|
||||
(include c.inc)
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
(jbuild_version 1)
|
||||
(include a.inc)
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
(jbuild_version 1)
|
||||
(include a.inc)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$ dune build --display short
|
||||
File "dune", line 2, characters 0-15:
|
||||
File "dune", line 1, characters 0-15:
|
||||
Error: Recursive inclusion of jbuild files detected:
|
||||
File a.inc is included from c.inc:2
|
||||
--> included from b.inc:2
|
||||
--> included from a.inc:2
|
||||
--> included from dune:2
|
||||
File a.inc is included from c.inc:1
|
||||
--> included from b.inc:1
|
||||
--> included from a.inc:1
|
||||
--> included from dune:1
|
||||
[1]
|
||||
|
|
|
|||
|
|
@ -22,5 +22,3 @@
|
|||
((name runtest)
|
||||
(deps (foo.dune))
|
||||
(action (echo "${read:foo.dune}"))))
|
||||
|
||||
(jbuild_version 1)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executables
|
||||
((names (technologic))
|
||||
(libraries (js_of_ocaml x js_of_ocaml.weak))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name x)
|
||||
(public_name x)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name runtest)
|
||||
(action (system "${lib-available:unix}"))))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(rule (copy ${read:x} a))
|
||||
(rule (copy ${read:y} b))
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(ocamllex (lexer1 lexer2))
|
||||
|
||||
(menhir
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name print-merlins)
|
||||
(deps (lib/.merlin exe/.merlin))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name x)
|
||||
(libraries (foo))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name fooppx)
|
||||
(kind ppx_rewriter)))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(executable
|
||||
((name sanitize_dot_merlin)
|
||||
(libraries (str))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name foobar)
|
||||
(libraries (bytes))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(library
|
||||
((name foobar_sub)
|
||||
(public_name foobar.sub)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
(jbuild_version 1)
|
||||
|
||||
(alias
|
||||
((name runtest)
|
||||
(deps (${SCOPE_ROOT}/023e1a58-4d08-11e7-a041-aa000008c8a6))))
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
(lang dune 1.0)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue