Dune upgrade V1 -> V2

CHANGES.md

@@ -259,9 +259,9 @@ Unreleased
   `dirs` stanza in `dune` files. (#2456, @rgrinberg)
 
 - Add a new config option `sandboxing_preference`, the cli argument `--sandbox`,
-  and the dep spec `sandbox` in dune language. These let the user control the level of
-  sandboxing done by dune per rule and globally. The rule specification takes precedence.
-  The global configuration merely specifies the default.
+  and the dep spec `sandbox` in dune language. These let the user control the
+  level of sandboxing done by dune per rule and globally. The rule specification
+  takes precedence. The global configuration merely specifies the default.
   (#2213, @aalekseyev, @diml)
 
 - Remove support for old style subsystems. Dune will now emit a warning to
@@ -297,10 +297,10 @@ Unreleased
   sandboxing and in general reduces build directory pollution. (#2486,
   @aalekseyev, fixes #2482)
 
-- `c_flags`, `c_names` and `cxx_names` are now supported in `executable`
-  and `executables` stanzas. (#2562, @nojb)
-  Note: this feature has been subsequently extended into a separate
-  `foreign_stubs` field. (#2659, RFC #2650, @snowleopard)
+- `c_flags`, `c_names` and `cxx_names` are now supported in `executable` and
+  `executables` stanzas. (#2562, @nojb) Note: this feature has been subsequently
+  extended into a separate `foreign_stubs` field. The fields `c(xx)_names` and
+  `c(xx)_flags` are now deleted. (#2659, RFC #2650, @snowleopard)
 
 - Remove git integration from `$ dune upgrade` (#2565, @rgrinberg)
 
@@ -395,6 +395,9 @@ Unreleased
 
 - Allow `.opam.template` files to be generated using rules (#2866, @rgrinberg)
 
+- Delete the deprecated `self_build_stubs_archive` field, replaced by
+  `foreign_archives`.
+
 1.11.4 (09/10/2019)
 -------------------
 

doc/dune-files.rst

@@ -388,13 +388,13 @@ to use the :ref:`include_subdirs` stanza.
 - ``(foreign_stubs <foreign-stubs-spec>)`` specifies foreign source files, e.g.
   C or C++ stubs, to be compiled and packaged together with the library. See
   the section :ref:`foreign-sources-and-archives` for more details. This field
-  replaces the now deprecated fields ``c_names``, ``c_flags``, ``cxx_names``
+  replaces the now deleted fields ``c_names``, ``c_flags``, ``cxx_names``
   and ``cxx_flags``.
 
 - ``(foreign_archives <foreign-archives-list>)`` specifies archives of foreign
   object files to be packaged with the library. See the section
   :ref:`foreign-archives` for more details. This field replaces the now
-  deprecated field ``self_build_stubs_archive``.
+  deleted field ``self_build_stubs_archive``.
 
 - ``(install_c_headers (<names>))``, if your library has public C header files
   that must be installed, you must list them in this field, without the ``.h``

doc/dune-libs.rst

@@ -82,7 +82,7 @@ this flag file using ``:include``:
 
   (library
    (name mylib)
-   (c_names foo)
+   (foreign_stubs (language c) (names foo))
    (c_library_flags (:include (flags.sexp))))
 
 For this, generate the list of flags for your library — for example

src/dune/file_tree.mli

@@ -13,6 +13,8 @@ module Dune_file : sig
     val get_sexp_and_destroy : t -> Dune_lang.Ast.t list
   end
 
+  val fname : string
+
   val jbuild_fname : string
 
   type t = private