ocaml / dune / 27768

7%

Build Type

push

github

Committed by web-flow

Commit Message

Create cookie file for toolchain packages (#10782)

This fixes two issues with cookies for toolchain packages:

Prior to this change, dune expected toolchain cookies to be created
inside the toolchains directory, ie. outside of the project. The
machinery for creating cookies only works within the build directory,
so cookies for toolchain packages were never created. The location of
the cookie had to be the same as the location of the installed
package, in what dune referred to as the package's "target_dir". The
fix is to decouply these two locations by adding a new path "prefix"
to packages, corresponding to the "--prefix" argument of most
configure scripts. This allows toolchain packages to have a
"target_dir" within the build directory, and for a cookie file to be
created within its "target_dir", while still allowing the package to
be installed outside the project inside its "prefix", inside the
toolchains directory.

The second issue is that the contents of the cookie was based on the
package's "target_dir", and thus cookies for toolchain packages would
be empty (toolchain packages are now installed in the package's
"prefix" dir instead). Dune makes the distinction between the "paths"
and "write_paths" of a package, the latter being the unsandboxed final
install paths of the package, and it's the "target_dir" within a
package's "write_paths" that is traversed (in the absence of a
<package>.install file) to determine the contents of the package's
cookie. The fix was to detect the case where the "paths" of a package
contains a prefix referring outside the build directory, and in such a
case, traverse the directory at that path rather than the one at
"target_dir".

Toolchains still don't completely work, as in some cases build tools
are unable to find binaries installed by the compiler package, however
manual inspection shows that the cookie is being created for toolchain
packages and contains the expected contents. Fix... (continued)

Run Details

4 of 35 new or added lines in 3 files covered. (11.43%)

105 existing lines in 3 files now uncovered.

2917 of 42335 relevant lines covered (6.89%)

26907.01 hits per line