Merge branch 'main' into oxcaml-ci-opam

Author: Alizter

bench/micro/dune_bench/dune

@@ -1,6 +1,6 @@
 (library
  (name dune_bench)
- (libraries stdune fiber dune_engine dune_rules)
+ (libraries stdune fiber dune_engine)
  (library_flags -linkall)
  (preprocess
   (pps ppx_bench)))

bench/micro/memo_bench/dune

@@ -3,4 +3,4 @@
  (library_flags -linkall)
  (preprocess
   (pps ppx_bench))
- (libraries fiber stdune memo core_bench.inline_benchmarks))
+ (libraries fiber stdune memo))

doc/howto/index.rst

@@ -24,3 +24,4 @@ These guides will help you use Dune's features in your project.
    rule-generation
    override-default-entrypoint
    release-binaries-with-github-action
+   use-opam-alongside-dune-package-management

doc/howto/use-opam-alongside-dune-package-management.rst

@@ -0,0 +1,47 @@
+How to Use Opam Alongside Dune Package Management
+==================================================
+
+This guide will show you a workflow for gradually adopting Dune Package
+Management, while retaining the use of an Opam switch as the default way of
+resolving dependencies of a project. It assumes you have a project with
+dependencies, and are managing those dependencies with an Opam switch.
+By the end of this guide you'll have enabled Dune Package Management for your
+project, however by default Dune will still use an Opam switch to resolve your
+project's dependencies. By setting an environment variable or passing an extra
+argument to commands like ``dune build`` you'll be able to toggle between an
+Opam-based workflow and a purely Dune-based workflow.
+
+Create a file named ``dune-workspace`` at the root of your project, with the following
+contents:
+
+.. code:: scheme
+
+   (lang dune 3.20)
+
+   (pkg disabled)
+
+Since ``dune-workspace`` is the default workspace file, this tells Dune that by
+default, don't use its internal package management mechanism to resolve the
+project's dependencies, even in the presence of a lockdir.
+
+Now create a second file in the project root named ``dune-workspace.pkg``. The
+name of this file isn't important, but conventionally alternative workspace
+files begin with the ``dune-workspace.`` prefix. Add the following to this new
+file:
+
+.. code:: scheme
+
+   (lang dune 3.20)
+
+   (pkg enabled)
+
+With these two files in place, by default Dune will use the specified Opam
+switch to resolve your project's dependencies. However, setting the environment
+variable ``DUNE_WORKSPACE=dune-workspace.pkg`` will cause Dune to use
+its internal package management mechanism to resolve dependencies instead. Unset
+the ``DUNE_WORKSPACE`` environment variable to return to an Opam-based workflow.
+
+Alternatively to setting the ``DUNE_WORKSPACE`` environment variable, invoking
+commands like ``dune build``, ``dune exec``, and ``dune pkg lock`` with the
+argument ``--workspace=dune-workspace.pkg`` also has the effect of changing
+which workspace file Dune will use to the one which enables package management.

otherlibs/dune-rpc-lwt/test/dune

@@ -7,9 +7,7 @@
    (package dune)))
  (libraries
   dune_rpc
-  csexp_rpc
   unix
-  dune_engine
   csexp
   stdune
   lwt

src/dune_config_file/dune_config_file.ml

@@ -25,9 +25,9 @@ module Dune_config = struct
 
     let equal t { authors; maintainers; maintenance_intent; license } =
       Option.equal (List.equal String.equal) t.authors authors
-      && Option.equal (List.equal String.equal) t.authors maintainers
-      && Option.equal (List.equal String.equal) t.authors maintenance_intent
-      && Option.equal (List.equal String.equal) t.authors license
+      && Option.equal (List.equal String.equal) t.maintainers maintainers
+      && Option.equal (List.equal String.equal) t.maintenance_intent maintenance_intent
+      && Option.equal (List.equal String.equal) t.license license
     ;;
 
     let decode =

src/dune_digest/dune

@@ -1,10 +1,3 @@
 (library
  (name dune_digest)
- (libraries
-  dune_metrics
-  blake3_mini
-  dune_stats
-  dune_console
-  dune_util
-  stdune
-  unix))
+ (libraries dune_metrics blake3_mini dune_console dune_util stdune unix))

src/dune_engine/dune

@@ -24,12 +24,10 @@
   dune_util
   build_path_prefix_map
   dune_output_truncation
-  csexp_rpc
   dune_rpc_private
   dune_rpc_client
   dune_thread_pool
   spawn
-  ocamlc_loc
   dune_file_watcher
   dune_digest
   dune_metrics)

src/dune_pkg/dune

@@ -7,7 +7,6 @@
  (libraries
   stdune
   lmdb
-  bigstringaf
   fiber
   fiber_util
   chrome_trace

src/dune_rules/dune

@@ -19,7 +19,6 @@
   dune_findlib
   dune_glob
   dune_lang
-  dune_meta_parser
   dune_patch
   dune_pkg
   re