From 988b0b29b0c8cf896f3af5272140c3606ed61821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Thu, 4 May 2023 00:17:57 +0200 Subject: [PATCH] melange: set min version to 3.8 (#7665) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * melange: set min version to 3.8 Signed-off-by: Javier Chávarri --- CHANGES.md | 3 ++ src/dune_rules/melange/melange_stanzas.ml | 2 +- test/blackbox-tests/test-cases/lib-modes.t | 49 +++++++++++++++++++ .../add-rules-under-melange-emit-target.t | 2 +- .../test-cases/melange/aliases.t | 2 +- .../test-cases/melange/basic-install.t | 2 +- .../melange/copy-files-include-subdirs.t | 2 +- .../copy-files-into-emit-target-folder.t | 2 +- .../test-cases/melange/copy-files-simple.t | 2 +- .../test-cases/melange/depend-on-installed.t | 6 +-- .../dune-js-file-unmangling.t/dune-project | 2 +- .../melange/dune-package-source-path.t | 4 +- .../emit-installed-complex.t/dune-project | 2 +- .../inner/dune-project | 2 +- .../melange/emit-installed-two-modes.t | 6 +-- .../test-cases/melange/emit-installed.t | 4 +- .../test-cases/melange/emit-private.t | 2 +- .../test-cases/melange/emit-select.t | 2 +- .../melange/emit-two-dune-projects.t | 6 +-- .../melange/empty-entries-target-dir-exists.t | 2 +- .../test-cases/melange/empty-entries.t | 2 +- .../blackbox-tests/test-cases/melange/flags.t | 2 +- .../test-cases/melange/gh7020.t | 4 +- .../melange/include_subdirs.t/dune-project | 2 +- .../test-cases/melange/intfonly-entries.t | 2 +- .../melange/intfonly.t/dune-project | 2 +- .../test-cases/melange/merlin-compile-flags.t | 2 +- .../test-cases/melange/merlin.t | 2 +- .../test-cases/melange/missing-melc.t | 2 +- .../test-cases/melange/mli.t/dune-project | 2 +- .../test-cases/melange/module-systems.t | 2 +- .../melange/multilib.t/dune-project | 2 +- .../melange/nested-melange-emit-stanzas.t | 2 +- .../test-cases/melange/ocaml-flags.t | 2 +- .../test-cases/melange/preprocess.t | 2 +- .../melange/private-module.t/dune-project | 2 +- .../test-cases/melange/private.t/dune-project | 2 +- .../test-cases/melange/promote-with-lib.t | 19 +------ .../test-cases/melange/promote.t | 2 +- .../test-cases/melange/public.t/dune-project | 2 +- .../test-cases/melange/rescript-syntax.t | 2 +- .../test-cases/melange/reused-module.t | 2 +- .../test-cases/melange/root-module.t | 2 +- .../melange/runtime-deps-in-target-dir.t | 2 +- .../test-cases/melange/simple.t/dune-project | 2 +- .../test-cases/melange/target-validation.t | 2 +- .../test-cases/melange/two-emit-stanzas.t | 2 +- .../test-cases/melange/unmangling.t | 2 +- .../melange/virtual_lib.t/dune-project | 2 +- 49 files changed, 108 insertions(+), 73 deletions(-) create mode 100644 test/blackbox-tests/test-cases/lib-modes.t diff --git a/CHANGES.md b/CHANGES.md index 041914215ac..3b62af1f110 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -150,6 +150,9 @@ Unreleased that have been globally installed, such as those coming from opam (@ejgallego, @Alizter) +- Bump minimum version of the dune language for the melange syntax extension + from 3.7 to 3.8 (#7665, @jchavarri) + 3.7.1 (2023-04-04) ------------------ diff --git a/src/dune_rules/melange/melange_stanzas.ml b/src/dune_rules/melange/melange_stanzas.ml index 0786223f3c4..7682a246cda 100644 --- a/src/dune_rules/melange/melange_stanzas.ml +++ b/src/dune_rules/melange/melange_stanzas.ml @@ -146,7 +146,7 @@ end let syntax = Dune_lang.Syntax.create ~name:Dune_project.Melange_syntax.name ~desc:"the Melange extension" - [ ((0, 1), `Since (3, 7)) ] + [ ((0, 1), `Since (3, 8)) ] let () = Dune_project.Extension.register_simple syntax diff --git a/test/blackbox-tests/test-cases/lib-modes.t b/test/blackbox-tests/test-cases/lib-modes.t new file mode 100644 index 00000000000..3ab3779a939 --- /dev/null +++ b/test/blackbox-tests/test-cases/lib-modes.t @@ -0,0 +1,49 @@ +Test library modes field + + $ cat > dune-project < (lang dune 3.7) + > EOF + + $ mkdir lib + + $ cat > lib/dune < (library + > (modes :standard \ native) + > (name mylib)) + > EOF + + $ cat > lib/mylib.ml < let some_binding = "string" + > EOF + + $ cat > dune < (executable + > (name hello) + > (libraries mylib)) + > EOF + + $ cat > hello.ml < let () = + > print_endline Mylib.some_binding + > EOF + +Fails with an informative error message if we parsed OSL for modes +in a version of dune lang that does not support them + + $ dune build hello.exe + File "lib/dune", line 1, characters 0-51: + 1 | (library + 2 | (modes :standard \ native) + 3 | (name mylib)) + Error: Ordered set language for modes is only available since version 3.8 of + the dune language. Please update your dune-project file to have (lang dune + 3.8). + [1] + + $ cat > dune-project < (lang dune 3.8) + > EOF + +Works for the most recent version + + $ dune build hello.exe diff --git a/test/blackbox-tests/test-cases/melange/add-rules-under-melange-emit-target.t b/test/blackbox-tests/test-cases/melange/add-rules-under-melange-emit-target.t index 7f0fd9f53b6..a0b8fa5834c 100644 --- a/test/blackbox-tests/test-cases/melange/add-rules-under-melange-emit-target.t +++ b/test/blackbox-tests/test-cases/melange/add-rules-under-melange-emit-target.t @@ -1,7 +1,7 @@ Test that the target directory exists $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/aliases.t b/test/blackbox-tests/test-cases/melange/aliases.t index bf85eadb8a9..28a1a51b271 100644 --- a/test/blackbox-tests/test-cases/melange/aliases.t +++ b/test/blackbox-tests/test-cases/melange/aliases.t @@ -1,7 +1,7 @@ Test alias field on melange.emit stanzas $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/basic-install.t b/test/blackbox-tests/test-cases/melange/basic-install.t index b0fb0f2d273..e3a63757199 100644 --- a/test/blackbox-tests/test-cases/melange/basic-install.t +++ b/test/blackbox-tests/test-cases/melange/basic-install.t @@ -1,7 +1,7 @@ Test that we can install melange mode libraries $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name foo)) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/copy-files-include-subdirs.t b/test/blackbox-tests/test-cases/melange/copy-files-include-subdirs.t index aa66da55a73..4c4cd3e1c34 100644 --- a/test/blackbox-tests/test-cases/melange/copy-files-include-subdirs.t +++ b/test/blackbox-tests/test-cases/melange/copy-files-include-subdirs.t @@ -6,7 +6,7 @@ Example using melange.emit, copy_files and include_subdirs > EOF $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/copy-files-into-emit-target-folder.t b/test/blackbox-tests/test-cases/melange/copy-files-into-emit-target-folder.t index 8016df16519..49b052df3fb 100644 --- a/test/blackbox-tests/test-cases/melange/copy-files-into-emit-target-folder.t +++ b/test/blackbox-tests/test-cases/melange/copy-files-into-emit-target-folder.t @@ -2,7 +2,7 @@ Example showing melange.emit and copy_files, where the files are copied into the melange.emit target folder $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/copy-files-simple.t b/test/blackbox-tests/test-cases/melange/copy-files-simple.t index ffe31ceac01..10ea48f9f64 100644 --- a/test/blackbox-tests/test-cases/melange/copy-files-simple.t +++ b/test/blackbox-tests/test-cases/melange/copy-files-simple.t @@ -1,7 +1,7 @@ Test simple interactions between melange.emit and copy_files $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/depend-on-installed.t b/test/blackbox-tests/test-cases/melange/depend-on-installed.t index b1f08f2dd5c..20ca157ce0a 100644 --- a/test/blackbox-tests/test-cases/melange/depend-on-installed.t +++ b/test/blackbox-tests/test-cases/melange/depend-on-installed.t @@ -3,7 +3,7 @@ Test dependency on installed package $ mkdir a b prefix app $ cat > a/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name a)) > (using melange 0.1) > EOF @@ -34,7 +34,7 @@ Test dependency on installed package Installing $TESTCASE_ROOT/prefix/lib/a/melange/a__Foo.cmt $ cat >b/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name b)) > (using melange 0.1) > EOF @@ -80,7 +80,7 @@ Test dependency on installed package Installing $TESTCASE_ROOT/prefix/lib/b/melange/b__Foo.cmt $ cat >app/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name app)) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/dune-js-file-unmangling.t/dune-project b/test/blackbox-tests/test-cases/melange/dune-js-file-unmangling.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/dune-js-file-unmangling.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/dune-js-file-unmangling.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/dune-package-source-path.t b/test/blackbox-tests/test-cases/melange/dune-package-source-path.t index 241fed7c5bb..bbdb8dcc2ac 100644 --- a/test/blackbox-tests/test-cases/melange/dune-package-source-path.t +++ b/test/blackbox-tests/test-cases/melange/dune-package-source-path.t @@ -3,7 +3,7 @@ form `foo.bar.baz` $ mkdir a app $ cat > a/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name a)) > (using melange 0.1) > EOF @@ -39,7 +39,7 @@ form `foo.bar.baz` (source (path Foo) (impl (path sub/foo.ml)))))) $ cat >app/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/dune-project b/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/dune-project index 3abd2d049e8..f00b955743c 100644 --- a/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.8) (package (name pkg2)) diff --git a/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/inner/dune-project b/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/inner/dune-project index 2edd0ed3016..81a1353ed84 100644 --- a/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/inner/dune-project +++ b/test/blackbox-tests/test-cases/melange/emit-installed-complex.t/inner/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.8) (package (name pkg1)) diff --git a/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t b/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t index a56d44a4646..f820d2d1df8 100644 --- a/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t +++ b/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t @@ -3,7 +3,7 @@ Test dependency on installed package $ mkdir a b c prefix $ cat > a/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name a)) > (using melange 0.1) > EOF @@ -39,7 +39,7 @@ Test dependency on installed package Installing $TESTCASE_ROOT/prefix/lib/a/melange/a__Foo.cmt $ cat >b/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF @@ -65,7 +65,7 @@ Test dependency on installed package foo $ cat >c/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/emit-installed.t b/test/blackbox-tests/test-cases/melange/emit-installed.t index 4f2a47013d4..8c3b5662082 100644 --- a/test/blackbox-tests/test-cases/melange/emit-installed.t +++ b/test/blackbox-tests/test-cases/melange/emit-installed.t @@ -3,7 +3,7 @@ Test dependency on installed package $ mkdir -p lib-a lib-a/sub b prefix $ cat > lib-a/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name a)) > (using melange 0.1) > EOF @@ -43,7 +43,7 @@ Test dependency on installed package Installing $TESTCASE_ROOT/prefix/lib/a/sub/sub.ml $ cat >b/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/emit-private.t b/test/blackbox-tests/test-cases/melange/emit-private.t index fce429df6d0..662489d4af9 100644 --- a/test/blackbox-tests/test-cases/melange/emit-private.t +++ b/test/blackbox-tests/test-cases/melange/emit-private.t @@ -1,7 +1,7 @@ Test dependency on a private library in the same package as melange.emit $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name a)) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/emit-select.t b/test/blackbox-tests/test-cases/melange/emit-select.t index 3f45fb0b5bc..ae054c0566d 100644 --- a/test/blackbox-tests/test-cases/melange/emit-select.t +++ b/test/blackbox-tests/test-cases/melange/emit-select.t @@ -1,7 +1,7 @@ using `(select ...)` in melange.emit $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF $ cat >bar.melange.ml < xyz/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (package (name aa_fe)) > (using melange 0.1) > EOF @@ -19,12 +19,12 @@ Test dependency on installed package > EOF $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF $ cat >dune-workspace < (lang dune 3.7) + > (lang dune 3.8) > EOF $ cat > dune < dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/empty-entries.t b/test/blackbox-tests/test-cases/melange/empty-entries.t index 7c083b346bd..5a18a67186b 100644 --- a/test/blackbox-tests/test-cases/melange/empty-entries.t +++ b/test/blackbox-tests/test-cases/melange/empty-entries.t @@ -1,7 +1,7 @@ Test (modules) field can be left empty $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/flags.t b/test/blackbox-tests/test-cases/melange/flags.t index f66836d8de7..cf18087858f 100644 --- a/test/blackbox-tests/test-cases/melange/flags.t +++ b/test/blackbox-tests/test-cases/melange/flags.t @@ -1,7 +1,7 @@ Test flags and compile_flags fields on melange.emit stanza $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/gh7020.t b/test/blackbox-tests/test-cases/melange/gh7020.t index e262479ad73..971aaedd86c 100644 --- a/test/blackbox-tests/test-cases/melange/gh7020.t +++ b/test/blackbox-tests/test-cases/melange/gh7020.t @@ -3,7 +3,7 @@ Reproduce github #7020 $ dir=_to-install $ mkdir $dir $ cat >$dir/dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > (package > (name dummyfoo)) @@ -35,7 +35,7 @@ Reproduce github #7020 $ export OCAMLPATH=$PWD/$dir/_install/lib $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/include_subdirs.t/dune-project b/test/blackbox-tests/test-cases/melange/include_subdirs.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/include_subdirs.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/include_subdirs.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/intfonly-entries.t b/test/blackbox-tests/test-cases/melange/intfonly-entries.t index 8f59266a5b5..3aaa03bf441 100644 --- a/test/blackbox-tests/test-cases/melange/intfonly-entries.t +++ b/test/blackbox-tests/test-cases/melange/intfonly-entries.t @@ -1,7 +1,7 @@ Entry points should not allow mli only modules as entry points. $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/intfonly.t/dune-project b/test/blackbox-tests/test-cases/melange/intfonly.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/intfonly.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/intfonly.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/merlin-compile-flags.t b/test/blackbox-tests/test-cases/melange/merlin-compile-flags.t index 22ca9756115..c984b589745 100644 --- a/test/blackbox-tests/test-cases/melange/merlin-compile-flags.t +++ b/test/blackbox-tests/test-cases/melange/merlin-compile-flags.t @@ -1,7 +1,7 @@ Show that the merlin config knows about melange.compile_flags $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/merlin.t b/test/blackbox-tests/test-cases/melange/merlin.t index fcdbed03165..47d4665dcef 100644 --- a/test/blackbox-tests/test-cases/melange/merlin.t +++ b/test/blackbox-tests/test-cases/melange/merlin.t @@ -8,7 +8,7 @@ $ export BUILD_PATH_PREFIX_MAP="/MELC_STDLIB=$(ocamlfind query melange):$BUILD_PATH_PREFIX_MAP" $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/missing-melc.t b/test/blackbox-tests/test-cases/melange/missing-melc.t index 6f883a2955b..81c86a07d1b 100644 --- a/test/blackbox-tests/test-cases/melange/missing-melc.t +++ b/test/blackbox-tests/test-cases/melange/missing-melc.t @@ -1,7 +1,7 @@ Test cases when melc is not available $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/mli.t/dune-project b/test/blackbox-tests/test-cases/melange/mli.t/dune-project index c0805477dac..f93f4630ab0 100644 --- a/test/blackbox-tests/test-cases/melange/mli.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/mli.t/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/module-systems.t b/test/blackbox-tests/test-cases/melange/module-systems.t index b7d3bba5703..6daf3ea16c9 100644 --- a/test/blackbox-tests/test-cases/melange/module-systems.t +++ b/test/blackbox-tests/test-cases/melange/module-systems.t @@ -1,7 +1,7 @@ Parses the full form ( ) $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/multilib.t/dune-project b/test/blackbox-tests/test-cases/melange/multilib.t/dune-project index c0805477dac..f93f4630ab0 100644 --- a/test/blackbox-tests/test-cases/melange/multilib.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/multilib.t/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/nested-melange-emit-stanzas.t b/test/blackbox-tests/test-cases/melange/nested-melange-emit-stanzas.t index bfd8e69c6f3..5a8f588e67b 100644 --- a/test/blackbox-tests/test-cases/melange/nested-melange-emit-stanzas.t +++ b/test/blackbox-tests/test-cases/melange/nested-melange-emit-stanzas.t @@ -1,7 +1,7 @@ Make sure an error is returned if trying to nest `melange.emit` stanzas $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF $ mkdir -p a/output/b diff --git a/test/blackbox-tests/test-cases/melange/ocaml-flags.t b/test/blackbox-tests/test-cases/melange/ocaml-flags.t index 1025cf85821..13dd413e650 100644 --- a/test/blackbox-tests/test-cases/melange/ocaml-flags.t +++ b/test/blackbox-tests/test-cases/melange/ocaml-flags.t @@ -1,7 +1,7 @@ Test melange.compile_flags, ocamlc_flags and ocamlopt_flags fields on melange.emit stanza $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/preprocess.t b/test/blackbox-tests/test-cases/melange/preprocess.t index 6a0a192a1f8..217d7a4e691 100644 --- a/test/blackbox-tests/test-cases/melange/preprocess.t +++ b/test/blackbox-tests/test-cases/melange/preprocess.t @@ -1,7 +1,7 @@ Test (preprocess) field on melange.emit stanza $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/private-module.t/dune-project b/test/blackbox-tests/test-cases/melange/private-module.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/private-module.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/private-module.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/private.t/dune-project b/test/blackbox-tests/test-cases/melange/private.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/private.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/private.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/promote-with-lib.t b/test/blackbox-tests/test-cases/melange/promote-with-lib.t index d3a6c5ebefa..b7398ef34eb 100644 --- a/test/blackbox-tests/test-cases/melange/promote-with-lib.t +++ b/test/blackbox-tests/test-cases/melange/promote-with-lib.t @@ -1,7 +1,7 @@ Test melange.emit promotion $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF @@ -31,23 +31,6 @@ Test melange.emit promotion > print_endline "hello" > EOF -Fails with an informative error message if we parsed OSL for modes - - $ dune build @dist - File "lib/dune", line 1, characters 0-50: - 1 | (library - 2 | (modes :standard melange) - 3 | (name mylib)) - Error: Ordered set language for modes is only available since version 3.8 of - the dune language. Please update your dune-project file to have (lang dune - 3.8). - [1] - - - $ cat > dune-project < (lang dune 3.8) - > (using melange 0.1) - > EOF $ dune build @dist Library has `(modes :standard)` so it also builds for bytecode / native diff --git a/test/blackbox-tests/test-cases/melange/promote.t b/test/blackbox-tests/test-cases/melange/promote.t index fd4afe0053b..f27cbb19e49 100644 --- a/test/blackbox-tests/test-cases/melange/promote.t +++ b/test/blackbox-tests/test-cases/melange/promote.t @@ -1,7 +1,7 @@ Test melange.emit promotion $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/public.t/dune-project b/test/blackbox-tests/test-cases/melange/public.t/dune-project index a971f73f967..2c35fb37309 100644 --- a/test/blackbox-tests/test-cases/melange/public.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/public.t/dune-project @@ -1,4 +1,4 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/rescript-syntax.t b/test/blackbox-tests/test-cases/melange/rescript-syntax.t index 46d42335d6e..79add68d8ea 100644 --- a/test/blackbox-tests/test-cases/melange/rescript-syntax.t +++ b/test/blackbox-tests/test-cases/melange/rescript-syntax.t @@ -1,7 +1,7 @@ Test melange.emit promotion $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/reused-module.t b/test/blackbox-tests/test-cases/melange/reused-module.t index 1eb404ce830..9ff22ae4323 100644 --- a/test/blackbox-tests/test-cases/melange/reused-module.t +++ b/test/blackbox-tests/test-cases/melange/reused-module.t @@ -1,7 +1,7 @@ Test error message for modules belonging to melange.emit and another stanza $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/root-module.t b/test/blackbox-tests/test-cases/melange/root-module.t index 6fa99ed32e5..79d20f03dec 100644 --- a/test/blackbox-tests/test-cases/melange/root-module.t +++ b/test/blackbox-tests/test-cases/melange/root-module.t @@ -1,7 +1,7 @@ A library can be shadowed by an internal module name: $ cat >dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/runtime-deps-in-target-dir.t b/test/blackbox-tests/test-cases/melange/runtime-deps-in-target-dir.t index 605f88b6845..107c7fa40c5 100644 --- a/test/blackbox-tests/test-cases/melange/runtime-deps-in-target-dir.t +++ b/test/blackbox-tests/test-cases/melange/runtime-deps-in-target-dir.t @@ -1,6 +1,6 @@ $ cat > dune-project << EOF - > (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF $ mkdir output diff --git a/test/blackbox-tests/test-cases/melange/simple.t/dune-project b/test/blackbox-tests/test-cases/melange/simple.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/simple.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/simple.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1) diff --git a/test/blackbox-tests/test-cases/melange/target-validation.t b/test/blackbox-tests/test-cases/melange/target-validation.t index 695bb093f4c..49e562ca0b4 100644 --- a/test/blackbox-tests/test-cases/melange/target-validation.t +++ b/test/blackbox-tests/test-cases/melange/target-validation.t @@ -1,7 +1,7 @@ Validation of target field in melange.emit stanzas $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/two-emit-stanzas.t b/test/blackbox-tests/test-cases/melange/two-emit-stanzas.t index 169ef891193..1d5487c8dd9 100644 --- a/test/blackbox-tests/test-cases/melange/two-emit-stanzas.t +++ b/test/blackbox-tests/test-cases/melange/two-emit-stanzas.t @@ -1,7 +1,7 @@ Building a project with 2 melange.emit stanzas should add rules to both aliases $ cat > dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF $ cat > dune < dune-project < (lang dune 3.7) + > (lang dune 3.8) > (using melange 0.1) > EOF diff --git a/test/blackbox-tests/test-cases/melange/virtual_lib.t/dune-project b/test/blackbox-tests/test-cases/melange/virtual_lib.t/dune-project index c6708f7a614..f40bf8c4a59 100644 --- a/test/blackbox-tests/test-cases/melange/virtual_lib.t/dune-project +++ b/test/blackbox-tests/test-cases/melange/virtual_lib.t/dune-project @@ -1,3 +1,3 @@ -(lang dune 3.7) +(lang dune 3.8) (using melange 0.1)