diff --git a/doc/dune b/doc/dune index 3062470f..8660c178 100644 --- a/doc/dune +++ b/doc/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (rule ((targets (dune.1)) (action (with-stdout-to ${@} diff --git a/example/dune b/example/dune index 00d9347d..56b704bd 100644 --- a/example/dune +++ b/example/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (ignored_subdirs (sample-projects)) (alias diff --git a/example/sample-projects/hello_world/bin/dune b/example/sample-projects/hello_world/bin/dune index 9c7439fb..42f77dc1 100644 --- a/example/sample-projects/hello_world/bin/dune +++ b/example/sample-projects/hello_world/bin/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executables ((names (main)) (libraries (hello_world)))) diff --git a/example/sample-projects/hello_world/lib/dune b/example/sample-projects/hello_world/lib/dune index f3ebcb4c..f2a20184 100644 --- a/example/sample-projects/hello_world/lib/dune +++ b/example/sample-projects/hello_world/lib/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name hello_world) (public_name hello_world))) diff --git a/example/sample-projects/hello_world/test/dune b/example/sample-projects/hello_world/test/dune index 6edbe6f4..10662055 100644 --- a/example/sample-projects/hello_world/test/dune +++ b/example/sample-projects/hello_world/test/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (rule ((targets (hello_world.output)) (action (with-stdout-to ${@} (run ${bin:hello_world}))))) diff --git a/example/sample-projects/with-configure-step/dune b/example/sample-projects/with-configure-step/dune index 9333cbb3..a3b036e6 100644 --- a/example/sample-projects/with-configure-step/dune +++ b/example/sample-projects/with-configure-step/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (rule ((fallback) (targets (config)) diff --git a/example/sample-projects/with-configure-step/src/dune b/example/sample-projects/with-configure-step/src/dune index feeecc39..c9b7e4f8 100644 --- a/example/sample-projects/with-configure-step/src/dune +++ b/example/sample-projects/with-configure-step/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executables ((names (plop)))) diff --git a/test/blackbox-tests/dune b/test/blackbox-tests/dune index 42c1b84d..1272f735 100644 --- a/test/blackbox-tests/dune +++ b/test/blackbox-tests/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (ignored_subdirs (test-cases)) (library diff --git a/test/blackbox-tests/test-cases/aliases/dune b/test/blackbox-tests/test-cases/aliases/dune index 40466632..0b5ccf27 100644 --- a/test/blackbox-tests/test-cases/aliases/dune +++ b/test/blackbox-tests/test-cases/aliases/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name just-in-src) (deps ((alias src/x))))) diff --git a/test/blackbox-tests/test-cases/aliases/dune-project b/test/blackbox-tests/test-cases/aliases/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/aliases/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/aliases/src/dune b/test/blackbox-tests/test-cases/aliases/src/dune index aafdaf1c..b2a97998 100644 --- a/test/blackbox-tests/test-cases/aliases/src/dune +++ b/test/blackbox-tests/test-cases/aliases/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name x) (action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n"))))) diff --git a/test/blackbox-tests/test-cases/aliases/src/foo/bar/dune b/test/blackbox-tests/test-cases/aliases/src/foo/bar/dune index aafdaf1c..b2a97998 100644 --- a/test/blackbox-tests/test-cases/aliases/src/foo/bar/dune +++ b/test/blackbox-tests/test-cases/aliases/src/foo/bar/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name x) (action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n"))))) diff --git a/test/blackbox-tests/test-cases/aliases/src/foo/baz/dune b/test/blackbox-tests/test-cases/aliases/src/foo/baz/dune index aafdaf1c..b2a97998 100644 --- a/test/blackbox-tests/test-cases/aliases/src/foo/baz/dune +++ b/test/blackbox-tests/test-cases/aliases/src/foo/baz/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name x) (action (chdir ${ROOT} (echo "running in ${path-no-dep:.}\n"))))) diff --git a/test/blackbox-tests/test-cases/block-strings/dune-project b/test/blackbox-tests/test-cases/block-strings/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/block-strings/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/byte-code-only/dune-project b/test/blackbox-tests/test-cases/byte-code-only/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/byte-code-only/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/c-stubs/dune b/test/blackbox-tests/test-cases/c-stubs/dune index 5e0ae170..e69de29b 100644 --- a/test/blackbox-tests/test-cases/c-stubs/dune +++ b/test/blackbox-tests/test-cases/c-stubs/dune @@ -1 +0,0 @@ -(jbuild_version 1) diff --git a/test/blackbox-tests/test-cases/c-stubs/dune-project b/test/blackbox-tests/test-cases/c-stubs/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/c-stubs/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/c-stubs/q/dune b/test/blackbox-tests/test-cases/c-stubs/q/dune index 0a201715..3804f985 100644 --- a/test/blackbox-tests/test-cases/c-stubs/q/dune +++ b/test/blackbox-tests/test-cases/c-stubs/q/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name q) (c_names (q_stub)))) diff --git a/test/blackbox-tests/test-cases/c-stubs/qnativerun/dune b/test/blackbox-tests/test-cases/c-stubs/qnativerun/dune index 7c2615e0..32a96d4c 100644 --- a/test/blackbox-tests/test-cases/c-stubs/qnativerun/dune +++ b/test/blackbox-tests/test-cases/c-stubs/qnativerun/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name run) (libraries (q)))) diff --git a/test/blackbox-tests/test-cases/configurator/c_test/dune b/test/blackbox-tests/test-cases/configurator/c_test/dune index 422628bf..d161ab1d 100644 --- a/test/blackbox-tests/test-cases/configurator/c_test/dune +++ b/test/blackbox-tests/test-cases/configurator/c_test/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name run) (libraries (dune.configurator)))) diff --git a/test/blackbox-tests/test-cases/configurator/config/dune b/test/blackbox-tests/test-cases/configurator/config/dune index 422628bf..d161ab1d 100644 --- a/test/blackbox-tests/test-cases/configurator/config/dune +++ b/test/blackbox-tests/test-cases/configurator/config/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name run) (libraries (dune.configurator)))) diff --git a/test/blackbox-tests/test-cases/configurator/dune-project b/test/blackbox-tests/test-cases/configurator/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/configurator/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/configurator/import-define/dune b/test/blackbox-tests/test-cases/configurator/import-define/dune index 422628bf..d161ab1d 100644 --- a/test/blackbox-tests/test-cases/configurator/import-define/dune +++ b/test/blackbox-tests/test-cases/configurator/import-define/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name run) (libraries (dune.configurator)))) diff --git a/test/blackbox-tests/test-cases/copy_files/dune b/test/blackbox-tests/test-cases/copy_files/dune index 3a1fd20d..599375d7 100644 --- a/test/blackbox-tests/test-cases/copy_files/dune +++ b/test/blackbox-tests/test-cases/copy_files/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (copy_files# lexers/*.ml{,i}) (copy_files# include/bar.h) diff --git a/test/blackbox-tests/test-cases/copy_files/dune-project b/test/blackbox-tests/test-cases/copy_files/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/copy_files/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/copy_files/lexers/dune b/test/blackbox-tests/test-cases/copy_files/lexers/dune index 51ee769b..12200f45 100644 --- a/test/blackbox-tests/test-cases/copy_files/lexers/dune +++ b/test/blackbox-tests/test-cases/copy_files/lexers/dune @@ -1,3 +1 @@ -(jbuild_version 1) - (ocamllex (lexer1)) diff --git a/test/blackbox-tests/test-cases/cross-compilation/bin/dune b/test/blackbox-tests/test-cases/cross-compilation/bin/dune index 9cc1d471..a9611a8d 100644 --- a/test/blackbox-tests/test-cases/cross-compilation/bin/dune +++ b/test/blackbox-tests/test-cases/cross-compilation/bin/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name blah) (public_name blah) diff --git a/test/blackbox-tests/test-cases/cross-compilation/dune b/test/blackbox-tests/test-cases/cross-compilation/dune index 821cabe2..00346d61 100644 --- a/test/blackbox-tests/test-cases/cross-compilation/dune +++ b/test/blackbox-tests/test-cases/cross-compilation/dune @@ -1,3 +1 @@ -(jbuild_version 1) - (rule (with-stdout-to file (run ./bin/blah.exe))) diff --git a/test/blackbox-tests/test-cases/cross-compilation/dune-project b/test/blackbox-tests/test-cases/cross-compilation/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/cross-compilation/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/cross-compilation/lib/dune b/test/blackbox-tests/test-cases/cross-compilation/lib/dune index 6c98b04b..5cc81dd6 100644 --- a/test/blackbox-tests/test-cases/cross-compilation/lib/dune +++ b/test/blackbox-tests/test-cases/cross-compilation/lib/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name p) (public_name p))) diff --git a/test/blackbox-tests/test-cases/depend-on-the-universe/dune-project b/test/blackbox-tests/test-cases/depend-on-the-universe/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/depend-on-the-universe/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/env/bin/jbuild b/test/blackbox-tests/test-cases/env/bin/dune similarity index 100% rename from test/blackbox-tests/test-cases/env/bin/jbuild rename to test/blackbox-tests/test-cases/env/bin/dune diff --git a/test/blackbox-tests/test-cases/env/jbuild b/test/blackbox-tests/test-cases/env/dune similarity index 100% rename from test/blackbox-tests/test-cases/env/jbuild rename to test/blackbox-tests/test-cases/env/dune diff --git a/test/blackbox-tests/test-cases/env/dune-project b/test/blackbox-tests/test-cases/env/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/env/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/env/src/jbuild b/test/blackbox-tests/test-cases/env/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/env/src/jbuild rename to test/blackbox-tests/test-cases/env/src/dune diff --git a/test/blackbox-tests/test-cases/env/vendor/a/jbuild b/test/blackbox-tests/test-cases/env/vendor/a/dune similarity index 100% rename from test/blackbox-tests/test-cases/env/vendor/a/jbuild rename to test/blackbox-tests/test-cases/env/vendor/a/dune diff --git a/test/blackbox-tests/test-cases/env/vendor/a/dune-project b/test/blackbox-tests/test-cases/env/vendor/a/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/env/vendor/a/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/env/vendor/a/src/jbuild b/test/blackbox-tests/test-cases/env/vendor/a/src/dune similarity index 100% rename from test/blackbox-tests/test-cases/env/vendor/a/src/jbuild rename to test/blackbox-tests/test-cases/env/vendor/a/src/dune diff --git a/test/blackbox-tests/test-cases/exclude-missing-module/dune-project b/test/blackbox-tests/test-cases/exclude-missing-module/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/exclude-missing-module/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/exec-cmd/dune b/test/blackbox-tests/test-cases/exec-cmd/dune index 648e1089..2b4a6056 100644 --- a/test/blackbox-tests/test-cases/exec-cmd/dune +++ b/test/blackbox-tests/test-cases/exec-cmd/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((modules (foo)) (name foo))) diff --git a/test/blackbox-tests/test-cases/exec-cmd/dune-project b/test/blackbox-tests/test-cases/exec-cmd/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/exec-cmd/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/findlib/dune-project b/test/blackbox-tests/test-cases/findlib/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/findlib/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/force-test/dune b/test/blackbox-tests/test-cases/force-test/dune index 2e6c139b..ef1ade16 100644 --- a/test/blackbox-tests/test-cases/force-test/dune +++ b/test/blackbox-tests/test-cases/force-test/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name f))) diff --git a/test/blackbox-tests/test-cases/force-test/dune-project b/test/blackbox-tests/test-cases/force-test/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/force-test/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/gen-opam-install-file/dune b/test/blackbox-tests/test-cases/gen-opam-install-file/dune index 2fceb68a..d5734e78 100644 --- a/test/blackbox-tests/test-cases/gen-opam-install-file/dune +++ b/test/blackbox-tests/test-cases/gen-opam-install-file/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name foo) (modules (foo)) diff --git a/test/blackbox-tests/test-cases/gen-opam-install-file/dune-project b/test/blackbox-tests/test-cases/gen-opam-install-file/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/gen-opam-install-file/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github20/dune b/test/blackbox-tests/test-cases/github20/dune index 82ff8e86..58e64b7f 100644 --- a/test/blackbox-tests/test-cases/github20/dune +++ b/test/blackbox-tests/test-cases/github20/dune @@ -1,4 +1,2 @@ -(jbuild_version 1) - (library ((name foo))) diff --git a/test/blackbox-tests/test-cases/github20/dune-project b/test/blackbox-tests/test-cases/github20/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github20/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github24/dune-project b/test/blackbox-tests/test-cases/github24/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github24/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github25/root/dune-project b/test/blackbox-tests/test-cases/github25/root/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github25/root/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github534/dune-project b/test/blackbox-tests/test-cases/github534/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github534/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github568/dune b/test/blackbox-tests/test-cases/github568/dune index 508fc1dd..b24f1fe5 100644 --- a/test/blackbox-tests/test-cases/github568/dune +++ b/test/blackbox-tests/test-cases/github568/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name lib1) diff --git a/test/blackbox-tests/test-cases/github568/dune-project b/test/blackbox-tests/test-cases/github568/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github568/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github597/dune-project b/test/blackbox-tests/test-cases/github597/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github597/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune index db41fcae..0a42ea3a 100644 --- a/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune +++ b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name runtest) (deps (main.exe)) diff --git a/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune-project b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github660/no-interfaces/dune b/test/blackbox-tests/test-cases/github660/no-interfaces/dune index db41fcae..0a42ea3a 100644 --- a/test/blackbox-tests/test-cases/github660/no-interfaces/dune +++ b/test/blackbox-tests/test-cases/github660/no-interfaces/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name runtest) (deps (main.exe)) diff --git a/test/blackbox-tests/test-cases/github660/no-interfaces/dune-project b/test/blackbox-tests/test-cases/github660/no-interfaces/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github660/no-interfaces/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github717-odoc-index/dune b/test/blackbox-tests/test-cases/github717-odoc-index/dune index d881dec3..410e5ed8 100644 --- a/test/blackbox-tests/test-cases/github717-odoc-index/dune +++ b/test/blackbox-tests/test-cases/github717-odoc-index/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name hello_world) (public_name hello_world) diff --git a/test/blackbox-tests/test-cases/github717-odoc-index/dune-project b/test/blackbox-tests/test-cases/github717-odoc-index/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github717-odoc-index/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github734/dune-project b/test/blackbox-tests/test-cases/github734/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github734/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github761/dune-project b/test/blackbox-tests/test-cases/github761/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github761/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github764/run.t b/test/blackbox-tests/test-cases/github764/run.t index 2f04e5c7..2315be16 100644 --- a/test/blackbox-tests/test-cases/github764/run.t +++ b/test/blackbox-tests/test-cases/github764/run.t @@ -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 diff --git a/test/blackbox-tests/test-cases/github784/dune-project b/test/blackbox-tests/test-cases/github784/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github784/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/ignored_subdirs/dune-project b/test/blackbox-tests/test-cases/ignored_subdirs/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/ignored_subdirs/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/include-loop/a.inc b/test/blackbox-tests/test-cases/include-loop/a.inc index dbd55d5d..4d8eb854 100644 --- a/test/blackbox-tests/test-cases/include-loop/a.inc +++ b/test/blackbox-tests/test-cases/include-loop/a.inc @@ -1,2 +1 @@ -(jbuild_version 1) (include b.inc) diff --git a/test/blackbox-tests/test-cases/include-loop/b.inc b/test/blackbox-tests/test-cases/include-loop/b.inc index 46930a6c..d63f5251 100644 --- a/test/blackbox-tests/test-cases/include-loop/b.inc +++ b/test/blackbox-tests/test-cases/include-loop/b.inc @@ -1,2 +1 @@ -(jbuild_version 1) (include c.inc) diff --git a/test/blackbox-tests/test-cases/include-loop/c.inc b/test/blackbox-tests/test-cases/include-loop/c.inc index 85ef54cd..fb38c9c9 100644 --- a/test/blackbox-tests/test-cases/include-loop/c.inc +++ b/test/blackbox-tests/test-cases/include-loop/c.inc @@ -1,2 +1 @@ -(jbuild_version 1) (include a.inc) diff --git a/test/blackbox-tests/test-cases/include-loop/dune b/test/blackbox-tests/test-cases/include-loop/dune index 85ef54cd..fb38c9c9 100644 --- a/test/blackbox-tests/test-cases/include-loop/dune +++ b/test/blackbox-tests/test-cases/include-loop/dune @@ -1,2 +1 @@ -(jbuild_version 1) (include a.inc) diff --git a/test/blackbox-tests/test-cases/include-loop/dune-project b/test/blackbox-tests/test-cases/include-loop/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/include-loop/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/include-loop/run.t b/test/blackbox-tests/test-cases/include-loop/run.t index bf044efa..1421b4e0 100644 --- a/test/blackbox-tests/test-cases/include-loop/run.t +++ b/test/blackbox-tests/test-cases/include-loop/run.t @@ -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] diff --git a/test/blackbox-tests/test-cases/inline_tests/dune-file/dune b/test/blackbox-tests/test-cases/inline_tests/dune-file/dune index 2f15dfea..fed47799 100644 --- a/test/blackbox-tests/test-cases/inline_tests/dune-file/dune +++ b/test/blackbox-tests/test-cases/inline_tests/dune-file/dune @@ -22,5 +22,3 @@ ((name runtest) (deps (foo.dune)) (action (echo "${read:foo.dune}")))) - -(jbuild_version 1) diff --git a/test/blackbox-tests/test-cases/inline_tests/dune-file/dune-project b/test/blackbox-tests/test-cases/inline_tests/dune-file/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/inline_tests/dune-file/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/inline_tests/dune-project b/test/blackbox-tests/test-cases/inline_tests/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/inline_tests/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/installable-dup-private-libs/a1/dune-project b/test/blackbox-tests/test-cases/installable-dup-private-libs/a1/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/installable-dup-private-libs/a1/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/installable-dup-private-libs/a2/dune-project b/test/blackbox-tests/test-cases/installable-dup-private-libs/a2/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/installable-dup-private-libs/a2/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/intf-only/a/dune-project b/test/blackbox-tests/test-cases/intf-only/a/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/intf-only/a/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/intf-only/b/dune-project b/test/blackbox-tests/test-cases/intf-only/b/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/intf-only/b/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/intf-only/c/dune-project b/test/blackbox-tests/test-cases/intf-only/c/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/intf-only/c/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/intf-only/d/dune-project b/test/blackbox-tests/test-cases/intf-only/d/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/intf-only/d/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/intf-only/dune-project b/test/blackbox-tests/test-cases/intf-only/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/intf-only/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/intf-only/foo/dune-project b/test/blackbox-tests/test-cases/intf-only/foo/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/intf-only/foo/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/bin/dune b/test/blackbox-tests/test-cases/js_of_ocaml/bin/dune index 9352897c..ea11bfdb 100644 --- a/test/blackbox-tests/test-cases/js_of_ocaml/bin/dune +++ b/test/blackbox-tests/test-cases/js_of_ocaml/bin/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executables ((names (technologic)) (libraries (js_of_ocaml x js_of_ocaml.weak)) diff --git a/test/blackbox-tests/test-cases/js_of_ocaml/lib/dune b/test/blackbox-tests/test-cases/js_of_ocaml/lib/dune index 82311633..535c3012 100644 --- a/test/blackbox-tests/test-cases/js_of_ocaml/lib/dune +++ b/test/blackbox-tests/test-cases/js_of_ocaml/lib/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name x) (public_name x) diff --git a/test/blackbox-tests/test-cases/lib-available/dune b/test/blackbox-tests/test-cases/lib-available/dune index c9baf8a0..a65ba7c4 100644 --- a/test/blackbox-tests/test-cases/lib-available/dune +++ b/test/blackbox-tests/test-cases/lib-available/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name runtest) (action (system "${lib-available:unix}")))) diff --git a/test/blackbox-tests/test-cases/lib-available/dune-project b/test/blackbox-tests/test-cases/lib-available/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/lib-available/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/loop/dune b/test/blackbox-tests/test-cases/loop/dune index c1480c86..fe106138 100644 --- a/test/blackbox-tests/test-cases/loop/dune +++ b/test/blackbox-tests/test-cases/loop/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (rule (copy ${read:x} a)) (rule (copy ${read:y} b)) diff --git a/test/blackbox-tests/test-cases/loop/dune-project b/test/blackbox-tests/test-cases/loop/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/loop/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/menhir/dune-project b/test/blackbox-tests/test-cases/menhir/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/menhir/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/menhir/src/dune b/test/blackbox-tests/test-cases/menhir/src/dune index 2077bb7d..50a4df31 100644 --- a/test/blackbox-tests/test-cases/menhir/src/dune +++ b/test/blackbox-tests/test-cases/menhir/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (ocamllex (lexer1 lexer2)) (menhir diff --git a/test/blackbox-tests/test-cases/merlin-tests/dune b/test/blackbox-tests/test-cases/merlin-tests/dune index ebf8aa95..0f3ec820 100644 --- a/test/blackbox-tests/test-cases/merlin-tests/dune +++ b/test/blackbox-tests/test-cases/merlin-tests/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name print-merlins) (deps (lib/.merlin exe/.merlin)) diff --git a/test/blackbox-tests/test-cases/merlin-tests/dune-project b/test/blackbox-tests/test-cases/merlin-tests/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/merlin-tests/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/merlin-tests/exe/dune b/test/blackbox-tests/test-cases/merlin-tests/exe/dune index 7e327a8e..d33cd220 100644 --- a/test/blackbox-tests/test-cases/merlin-tests/exe/dune +++ b/test/blackbox-tests/test-cases/merlin-tests/exe/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name x) (libraries (foo)))) diff --git a/test/blackbox-tests/test-cases/merlin-tests/ppx/dune b/test/blackbox-tests/test-cases/merlin-tests/ppx/dune index 0ec6ef55..d76a3800 100644 --- a/test/blackbox-tests/test-cases/merlin-tests/ppx/dune +++ b/test/blackbox-tests/test-cases/merlin-tests/ppx/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name fooppx) (kind ppx_rewriter))) diff --git a/test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/dune b/test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/dune index c05c8d98..bc7f19fd 100644 --- a/test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/dune +++ b/test/blackbox-tests/test-cases/merlin-tests/sanitize-dot-merlin/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name sanitize_dot_merlin) (libraries (str)))) diff --git a/test/blackbox-tests/test-cases/meta-gen/dune b/test/blackbox-tests/test-cases/meta-gen/dune index 01bed966..2ca20128 100644 --- a/test/blackbox-tests/test-cases/meta-gen/dune +++ b/test/blackbox-tests/test-cases/meta-gen/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name foobar) (libraries (bytes)) diff --git a/test/blackbox-tests/test-cases/meta-gen/dune-project b/test/blackbox-tests/test-cases/meta-gen/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/meta-gen/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/meta-gen/src/dune b/test/blackbox-tests/test-cases/meta-gen/src/dune index ad7f11d7..4db936c2 100644 --- a/test/blackbox-tests/test-cases/meta-gen/src/dune +++ b/test/blackbox-tests/test-cases/meta-gen/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name foobar_sub) (public_name foobar.sub) diff --git a/test/blackbox-tests/test-cases/misc/blah/dune b/test/blackbox-tests/test-cases/misc/blah/dune index 29f030f3..9ccc2a04 100644 --- a/test/blackbox-tests/test-cases/misc/blah/dune +++ b/test/blackbox-tests/test-cases/misc/blah/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name runtest) (deps (${SCOPE_ROOT}/023e1a58-4d08-11e7-a041-aa000008c8a6)))) diff --git a/test/blackbox-tests/test-cases/misc/dune-project b/test/blackbox-tests/test-cases/misc/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/misc/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/a/dune b/test/blackbox-tests/test-cases/multiple-private-libs/a/dune index ff31db40..b4407157 100644 --- a/test/blackbox-tests/test-cases/multiple-private-libs/a/dune +++ b/test/blackbox-tests/test-cases/multiple-private-libs/a/dune @@ -1,3 +1 @@ -(jbuild_version 1) - (library ((name test))) diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/a/dune-project b/test/blackbox-tests/test-cases/multiple-private-libs/a/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/multiple-private-libs/a/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/b/dune b/test/blackbox-tests/test-cases/multiple-private-libs/b/dune index ff31db40..b4407157 100644 --- a/test/blackbox-tests/test-cases/multiple-private-libs/b/dune +++ b/test/blackbox-tests/test-cases/multiple-private-libs/b/dune @@ -1,3 +1 @@ -(jbuild_version 1) - (library ((name test))) diff --git a/test/blackbox-tests/test-cases/multiple-private-libs/b/dune-project b/test/blackbox-tests/test-cases/multiple-private-libs/b/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/multiple-private-libs/b/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/null-dep/dune b/test/blackbox-tests/test-cases/null-dep/dune index 6f0ecf69..d4a17bd6 100644 --- a/test/blackbox-tests/test-cases/null-dep/dune +++ b/test/blackbox-tests/test-cases/null-dep/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (alias ((name runtest) (action (with-stdout-to ${null} (echo "hello world"))))) diff --git a/test/blackbox-tests/test-cases/null-dep/dune-project b/test/blackbox-tests/test-cases/null-dep/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/null-dep/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/ocaml-syntax/dune b/test/blackbox-tests/test-cases/ocaml-syntax/dune index 25c0fbeb..bbf5b51d 100644 --- a/test/blackbox-tests/test-cases/ocaml-syntax/dune +++ b/test/blackbox-tests/test-cases/ocaml-syntax/dune @@ -1,8 +1,6 @@ (* -*- tuareg -*- *) let () = Jbuild_plugin.V1.send {| -(jbuild_version 1) - (alias ((name runtest) (action (echo "ocaml syntax")))) diff --git a/test/blackbox-tests/test-cases/ocaml-syntax/dune-project b/test/blackbox-tests/test-cases/ocaml-syntax/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/ocaml-syntax/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune index d6e6d323..50ed67e5 100644 --- a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune +++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name lib) (modules (:standard \ test)))) diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune-project b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t index 0aa1554b..6af65376 100644 --- a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t +++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/run.t @@ -1,8 +1,8 @@ $ dune exec ./test.exe --debug-dep --display short File "dune", line 1, characters 0-0: Warning: Module "Lib" is used in several stanzas: - - dune:8 - - dune:4 + - dune:6 + - dune:2 To remove this warning, you must specify an explicit "modules" field in every library, executable, and executables stanzas in this jbuild file. Note that each module cannot appear in more than one "modules" field - it must belong @@ -16,8 +16,8 @@ $ dune build src/a.cma --debug-dep --display short File "src/dune", line 1, characters 0-0: Warning: Module "X" is used in several stanzas: - - src/dune:4 - - src/dune:3 + - src/dune:2 + - src/dune:1 To remove this warning, you must specify an explicit "modules" field in every library, executable, and executables stanzas in this jbuild file. Note that each module cannot appear in more than one "modules" field - it must belong diff --git a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/dune b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/dune index fc99e2cc..d0a1b57d 100644 --- a/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/dune +++ b/test/blackbox-tests/test-cases/ocamldep-multi-stanzas/src/dune @@ -1,4 +1,2 @@ -(jbuild_version 1) - (library ((name a))) (library ((name b))) diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune index d7f98d26..615baac2 100644 --- a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name scope1) (public_name scope1))) diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune-project b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope1/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune index 4294bbcd..c90cd1d0 100644 --- a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name scope2) (public_name scope2))) \ No newline at end of file diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune-project b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/diff-scope/scope2/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/dune-project b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/dune b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/dune index 5d1729dd..0f3cdbac 100644 --- a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/dune +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib1/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name root_lib1) (public_name root.lib1))) diff --git a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/dune b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/dune index e32ea1bc..ee8d3c05 100644 --- a/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/dune +++ b/test/blackbox-tests/test-cases/odoc-unique-mlds/same-scope/lib2/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name root_lib2) (public_name root.lib2))) diff --git a/test/blackbox-tests/test-cases/odoc/dune b/test/blackbox-tests/test-cases/odoc/dune index cfa4e496..02909502 100644 --- a/test/blackbox-tests/test-cases/odoc/dune +++ b/test/blackbox-tests/test-cases/odoc/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name foo) (modules (foo foo2)) diff --git a/test/blackbox-tests/test-cases/odoc/dune-project b/test/blackbox-tests/test-cases/odoc/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/odoc/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/output-obj/dune-project b/test/blackbox-tests/test-cases/output-obj/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/output-obj/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/package-dep/dune b/test/blackbox-tests/test-cases/package-dep/dune index a311c774..c782a325 100644 --- a/test/blackbox-tests/test-cases/package-dep/dune +++ b/test/blackbox-tests/test-cases/package-dep/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name foo) (public_name foo) diff --git a/test/blackbox-tests/test-cases/package-dep/dune-project b/test/blackbox-tests/test-cases/package-dep/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/package-dep/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/exes/dune b/test/blackbox-tests/test-cases/private-public-overlap/exes/dune index ce0cdca6..1befe005 100644 --- a/test/blackbox-tests/test-cases/private-public-overlap/exes/dune +++ b/test/blackbox-tests/test-cases/private-public-overlap/exes/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name privatelib) (modules (privatelib)))) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/exes/dune-project b/test/blackbox-tests/test-cases/private-public-overlap/exes/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/private-public-overlap/exes/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/optional/dune b/test/blackbox-tests/test-cases/private-public-overlap/optional/dune index d55f7f57..cfa739ca 100644 --- a/test/blackbox-tests/test-cases/private-public-overlap/optional/dune +++ b/test/blackbox-tests/test-cases/private-public-overlap/optional/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name privatelib) (modules (privatelib)))) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/optional/dune-project b/test/blackbox-tests/test-cases/private-public-overlap/optional/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/private-public-overlap/optional/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune b/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune index 0ecc8486..843648da 100644 --- a/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune +++ b/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name privatelib) (modules (privatelib)))) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune-project b/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/private-public-overlap/private-dep/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/private-public-overlap/run.t b/test/blackbox-tests/test-cases/private-public-overlap/run.t index c4f146d0..0d5f5172 100644 --- a/test/blackbox-tests/test-cases/private-public-overlap/run.t +++ b/test/blackbox-tests/test-cases/private-public-overlap/run.t @@ -2,7 +2,7 @@ public libraries may not have private dependencies $ dune build --display short --root private-dep Entering directory 'private-dep' - File "dune", line 10, characters 14-24: + File "dune", line 8, characters 14-24: Error: Library "privatelib" is private, it cannot be a dependency of a public library. You need to give "privatelib" a public name. ocamldep publiclib.ml.d diff --git a/test/blackbox-tests/test-cases/promote/dune b/test/blackbox-tests/test-cases/promote/dune index 82af3d30..48648177 100644 --- a/test/blackbox-tests/test-cases/promote/dune +++ b/test/blackbox-tests/test-cases/promote/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (rule (with-stdout-to x.gen (echo "toto"))) (alias diff --git a/test/blackbox-tests/test-cases/promote/dune-project b/test/blackbox-tests/test-cases/promote/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/promote/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/quoting/bad/dune-project b/test/blackbox-tests/test-cases/quoting/bad/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/quoting/bad/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/quoting/filename-space/dune-project b/test/blackbox-tests/test-cases/quoting/filename-space/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/quoting/filename-space/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/quoting/good/dune-project b/test/blackbox-tests/test-cases/quoting/good/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/quoting/good/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/quoting/quote-from-context/dune-project b/test/blackbox-tests/test-cases/quoting/quote-from-context/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/quoting/quote-from-context/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/quoting/quotes-multi/dune-project b/test/blackbox-tests/test-cases/quoting/quotes-multi/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/quoting/quotes-multi/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/reason/dune b/test/blackbox-tests/test-cases/reason/dune index 9f06e8ad..fa080e7d 100644 --- a/test/blackbox-tests/test-cases/reason/dune +++ b/test/blackbox-tests/test-cases/reason/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (rule (copy copy-sources/pped.pp.re pped.re)) (rule (copy copy-sources/pped.rei.pp pped.rei)) diff --git a/test/blackbox-tests/test-cases/reason/pp/dune b/test/blackbox-tests/test-cases/reason/pp/dune index c385afe2..0b169672 100644 --- a/test/blackbox-tests/test-cases/reason/pp/dune +++ b/test/blackbox-tests/test-cases/reason/pp/dune @@ -1,4 +1,2 @@ -(jbuild_version 1) - (executable ((name reasononlypp))) diff --git a/test/blackbox-tests/test-cases/reason/ppx/dune b/test/blackbox-tests/test-cases/reason/ppx/dune index 25278f01..ba79729e 100644 --- a/test/blackbox-tests/test-cases/reason/ppx/dune +++ b/test/blackbox-tests/test-cases/reason/ppx/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name reasonppx) (wrapped false) diff --git a/test/blackbox-tests/test-cases/redirections/dune-project b/test/blackbox-tests/test-cases/redirections/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/redirections/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/scope-bug/alib/dune b/test/blackbox-tests/test-cases/scope-bug/alib/dune index 26d5ea18..a2df48bf 100644 --- a/test/blackbox-tests/test-cases/scope-bug/alib/dune +++ b/test/blackbox-tests/test-cases/scope-bug/alib/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name alib) (public_name alib) diff --git a/test/blackbox-tests/test-cases/scope-bug/alib/dune-project b/test/blackbox-tests/test-cases/scope-bug/alib/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/scope-bug/alib/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/dune b/test/blackbox-tests/test-cases/scope-bug/blib/dune index 6d3639dc..dd82cb0a 100644 --- a/test/blackbox-tests/test-cases/scope-bug/blib/dune +++ b/test/blackbox-tests/test-cases/scope-bug/blib/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name blib) (public_name blib) diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/dune-project b/test/blackbox-tests/test-cases/scope-bug/blib/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/scope-bug/blib/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/scope-bug/blib/sub/dune b/test/blackbox-tests/test-cases/scope-bug/blib/sub/dune index 5ab19ae4..5d918960 100644 --- a/test/blackbox-tests/test-cases/scope-bug/blib/sub/dune +++ b/test/blackbox-tests/test-cases/scope-bug/blib/sub/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name sub) (public_name blib.sub))) diff --git a/test/blackbox-tests/test-cases/select/dune b/test/blackbox-tests/test-cases/select/dune index f9b01a2b..4a4669ad 100644 --- a/test/blackbox-tests/test-cases/select/dune +++ b/test/blackbox-tests/test-cases/select/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name main) (libraries diff --git a/test/blackbox-tests/test-cases/select/dune-project b/test/blackbox-tests/test-cases/select/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/select/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/use-meta/dune-project b/test/blackbox-tests/test-cases/use-meta/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/use-meta/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/utop/dune-project b/test/blackbox-tests/test-cases/utop/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/utop/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/utop/forutop/dune b/test/blackbox-tests/test-cases/utop/forutop/dune index 6cb704fa..9c84ab7a 100644 --- a/test/blackbox-tests/test-cases/utop/forutop/dune +++ b/test/blackbox-tests/test-cases/utop/forutop/dune @@ -1,4 +1,2 @@ -(jbuild_version 1) - (library ((name forutop))) diff --git a/test/common/dune b/test/common/dune index c15ca00a..2817963a 100644 --- a/test/common/dune +++ b/test/common/dune @@ -1,4 +1,2 @@ -(jbuild_version 1) - (library ((name test_common))) diff --git a/test/dune b/test/dune index 860c88b2..c38f6476 100644 --- a/test/dune +++ b/test/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - ;; execute this to check the behavior when background jobs take time to finish: ;; ;; $ ./_build/default/bin/main.exe build @test/fail-with-background-jobs-running diff --git a/test/unit-tests/configurator/dune b/test/unit-tests/configurator/dune index e2d33cc6..8a407096 100644 --- a/test/unit-tests/configurator/dune +++ b/test/unit-tests/configurator/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name test_configurator) (libraries (configurator)))) diff --git a/test/unit-tests/dune b/test/unit-tests/dune index adc1fdf5..47e7ee63 100644 --- a/test/unit-tests/dune +++ b/test/unit-tests/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name expect_test) (modules (expect_test)) diff --git a/test/unit-tests/ocaml-config/dune b/test/unit-tests/ocaml-config/dune index 97c850a5..f97648af 100644 --- a/test/unit-tests/ocaml-config/dune +++ b/test/unit-tests/ocaml-config/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (executable ((name gh637) (libraries (ocaml_config)))) diff --git a/vendor/cmdliner/src/dune b/vendor/cmdliner/src/dune index 850e23ae..d694907a 100644 --- a/vendor/cmdliner/src/dune +++ b/vendor/cmdliner/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name cmdliner) (libraries (caml)) diff --git a/vendor/opam-file-format/src/dune b/vendor/opam-file-format/src/dune index b02de190..1302e9b9 100644 --- a/vendor/opam-file-format/src/dune +++ b/vendor/opam-file-format/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name opam_file_format) (wrapped false))) diff --git a/vendor/re/src/dune b/vendor/re/src/dune index 1f311e23..4c503ba2 100644 --- a/vendor/re/src/dune +++ b/vendor/re/src/dune @@ -1,5 +1,3 @@ -(jbuild_version 1) - (library ((name re) (flags (:standard -w -50))