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:
parent
8727eb6c3c
commit
3cf2a0dab1
2
doc/dune
2
doc/dune
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
((targets (dune.1))
|
((targets (dune.1))
|
||||||
(action (with-stdout-to ${@}
|
(action (with-stdout-to ${@}
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(ignored_subdirs (sample-projects))
|
(ignored_subdirs (sample-projects))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executables
|
(executables
|
||||||
((names (main))
|
((names (main))
|
||||||
(libraries (hello_world))))
|
(libraries (hello_world))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name hello_world)
|
((name hello_world)
|
||||||
(public_name hello_world)))
|
(public_name hello_world)))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
((targets (hello_world.output))
|
((targets (hello_world.output))
|
||||||
(action (with-stdout-to ${@} (run ${bin:hello_world})))))
|
(action (with-stdout-to ${@} (run ${bin:hello_world})))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(rule
|
(rule
|
||||||
((fallback)
|
((fallback)
|
||||||
(targets (config))
|
(targets (config))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executables
|
(executables
|
||||||
((names (plop))))
|
((names (plop))))
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(ignored_subdirs (test-cases))
|
(ignored_subdirs (test-cases))
|
||||||
|
|
||||||
(library
|
(library
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name just-in-src)
|
((name just-in-src)
|
||||||
(deps ((alias src/x)))))
|
(deps ((alias src/x)))))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name x)
|
((name x)
|
||||||
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name x)
|
((name x)
|
||||||
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name x)
|
((name x)
|
||||||
(action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n")))))
|
(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
|
(library
|
||||||
((name q)
|
((name q)
|
||||||
(c_names (q_stub))))
|
(c_names (q_stub))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name run)
|
((name run)
|
||||||
(libraries (q))))
|
(libraries (q))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name run)
|
((name run)
|
||||||
(libraries (dune.configurator))))
|
(libraries (dune.configurator))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name run)
|
((name run)
|
||||||
(libraries (dune.configurator))))
|
(libraries (dune.configurator))))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name run)
|
((name run)
|
||||||
(libraries (dune.configurator))))
|
(libraries (dune.configurator))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(copy_files# lexers/*.ml{,i})
|
(copy_files# lexers/*.ml{,i})
|
||||||
(copy_files# include/bar.h)
|
(copy_files# include/bar.h)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,3 +1 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(ocamllex (lexer1))
|
(ocamllex (lexer1))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name blah)
|
((name blah)
|
||||||
(public_name blah)
|
(public_name blah)
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(rule (with-stdout-to file (run ./bin/blah.exe)))
|
(rule (with-stdout-to file (run ./bin/blah.exe)))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name p)
|
((name p)
|
||||||
(public_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
|
(executable
|
||||||
((modules (foo))
|
((modules (foo))
|
||||||
(name 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
|
(executable
|
||||||
((name f)))
|
((name f)))
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name foo)
|
((name foo)
|
||||||
(modules (foo))
|
(modules (foo))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,4 +1,2 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name foo)))
|
((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
|
(library
|
||||||
((name lib1)
|
((name lib1)
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest)
|
((name runtest)
|
||||||
(deps (main.exe))
|
(deps (main.exe))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest)
|
((name runtest)
|
||||||
(deps (main.exe))
|
(deps (main.exe))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name hello_world)
|
((name hello_world)
|
||||||
(public_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
|
$ mkdir symlink-outside-root
|
||||||
$ cd symlink-outside-root && ln -s ../sample-exe sample
|
$ 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
|
$ cd symlink-outside-root && jbuilder exec --root . -- sample/foo.exe
|
||||||
foo
|
foo
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,2 +1 @@
|
||||||
(jbuild_version 1)
|
|
||||||
(include b.inc)
|
(include b.inc)
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
(jbuild_version 1)
|
|
||||||
(include c.inc)
|
(include c.inc)
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
(jbuild_version 1)
|
|
||||||
(include a.inc)
|
(include a.inc)
|
||||||
|
|
|
@ -1,2 +1 @@
|
||||||
(jbuild_version 1)
|
|
||||||
(include a.inc)
|
(include a.inc)
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,8 +1,8 @@
|
||||||
$ dune build --display short
|
$ 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:
|
Error: Recursive inclusion of jbuild files detected:
|
||||||
File a.inc is included from c.inc:2
|
File a.inc is included from c.inc:1
|
||||||
--> included from b.inc:2
|
--> included from b.inc:1
|
||||||
--> included from a.inc:2
|
--> included from a.inc:1
|
||||||
--> included from dune:2
|
--> included from dune:1
|
||||||
[1]
|
[1]
|
||||||
|
|
|
@ -22,5 +22,3 @@
|
||||||
((name runtest)
|
((name runtest)
|
||||||
(deps (foo.dune))
|
(deps (foo.dune))
|
||||||
(action (echo "${read: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
|
(executables
|
||||||
((names (technologic))
|
((names (technologic))
|
||||||
(libraries (js_of_ocaml x js_of_ocaml.weak))
|
(libraries (js_of_ocaml x js_of_ocaml.weak))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name x)
|
((name x)
|
||||||
(public_name x)
|
(public_name x)
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest)
|
((name runtest)
|
||||||
(action (system "${lib-available:unix}"))))
|
(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:x} a))
|
||||||
(rule (copy ${read:y} b))
|
(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))
|
(ocamllex (lexer1 lexer2))
|
||||||
|
|
||||||
(menhir
|
(menhir
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name print-merlins)
|
((name print-merlins)
|
||||||
(deps (lib/.merlin exe/.merlin))
|
(deps (lib/.merlin exe/.merlin))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name x)
|
((name x)
|
||||||
(libraries (foo))))
|
(libraries (foo))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name fooppx)
|
((name fooppx)
|
||||||
(kind ppx_rewriter)))
|
(kind ppx_rewriter)))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(executable
|
(executable
|
||||||
((name sanitize_dot_merlin)
|
((name sanitize_dot_merlin)
|
||||||
(libraries (str))))
|
(libraries (str))))
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name foobar)
|
((name foobar)
|
||||||
(libraries (bytes))
|
(libraries (bytes))
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
(lang dune 1.0)
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(library
|
(library
|
||||||
((name foobar_sub)
|
((name foobar_sub)
|
||||||
(public_name foobar.sub)
|
(public_name foobar.sub)
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
(jbuild_version 1)
|
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
((name runtest)
|
((name runtest)
|
||||||
(deps (${SCOPE_ROOT}/023e1a58-4d08-11e7-a041-aa000008c8a6))))
|
(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