c97e17144e
This breaks downstreams linking to us on purpose to make sure that if someone is linking to Lix they're doing it on purpose and crucially not mixing up Nix and Lix versions in compatibility code. We still need to fix the internal includes to follow the same schema so we can drop the single-level include system entirely. However, this requires a little more effort. This adds pkg-config for libfetchers and config.h. Migration path: expr.hh -> lix/libexpr/expr.hh nix/config.h -> lix/config.h To apply this migration automatically, remove all `<nix/>` from includes, so: `#include <nix/expr.hh>` -> `#include <expr.hh>`. Then, the correct paths will be resolved from the tangled mess, and the clang-tidy automated fix will work. Then run the following for out of tree projects: ``` lix_root=$HOME/lix (cd $lix_root/clang-tidy && nix develop -c 'meson setup build && ninja -C build') run-clang-tidy -checks='-*,lix-fixincludes' -load=$lix_root/clang-tidy/build/liblix-clang-tidy.so -p build/ -fix src ``` Related: https://git.lix.systems/lix-project/nix-eval-jobs/pulls/5 Fixes: https://git.lix.systems/lix-project/lix/issues/279 Change-Id: I7498e903afa6850a731ef8ce77a70da6b2b46966
50 lines
2.4 KiB
Bash
Executable file
50 lines
2.4 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# Meson will call this with an absolute path to Bash.
|
|
# The shebang is just for convenience.
|
|
|
|
# The parser and lexer tab are generated via custom Meson targets in src/libexpr/meson.build,
|
|
# but Meson doesn't support marking only part of a target for install. The generation creates
|
|
# both headers (parser-tab.hh, lexer-tab.hh) and source files (parser-tab.cc, lexer-tab.cc),
|
|
# and we definitely want the former installed, but not the latter. This script is added to
|
|
# Meson's install steps to correct this, as the logic for it is just complex enough to
|
|
# warrant separate and careful handling, because both Meson's configured include directory
|
|
# may or may not be an absolute path, and DESTDIR may or may not be set at all, but can't be
|
|
# manipulated in Meson logic.
|
|
|
|
set -euo pipefail
|
|
|
|
echo "cleanup-install: removing Meson-placed C++ sources from dest includedir"
|
|
|
|
if [[ "${1/--help/}" != "$1" ]]; then
|
|
echo "cleanup-install: this script should only be called from the Meson build system"
|
|
exit 1
|
|
fi
|
|
|
|
# Ensure the includedir was passed as the first argument
|
|
# (set -u will make this fail otherwise).
|
|
includedir="$1"
|
|
# And then ensure that first argument is a directory that exists.
|
|
if ! [[ -d "$1" ]]; then
|
|
echo "cleanup-install: this script should only be called from the Meson build system"
|
|
echo "argv[1] (${1@Q}) is not a directory"
|
|
exit 2
|
|
fi
|
|
|
|
# If DESTDIR environment variable is set, prepend it to the include dir.
|
|
# Unfortunately, we cannot do this on the Meson side. We do have an environment variable
|
|
# `MESON_INSTALL_DESTDIR_PREFIX`, but that will not refer to the include directory if
|
|
# includedir has been set separately, which Lix's split-output derivation does.
|
|
# We also cannot simply do an inline bash conditional like "${DESTDIR:=}" or similar,
|
|
# because we need to specifically *join* DESTDIR and includedir with a slash, and *not*
|
|
# have a slash if DESTDIR isn't set at all, since $includedir could be a relative directory.
|
|
# Finally, DESTDIR is only available to us as an environment variable in these install scripts,
|
|
# not in Meson logic.
|
|
# Therefore, our best option is to have Meson pass this script the configured includedir,
|
|
# and perform this dance with it and $DESTDIR.
|
|
if [[ -n "${DESTDIR:-}" ]]; then
|
|
includedir="$DESTDIR/$includedir"
|
|
fi
|
|
|
|
# Intentionally not using -f.
|
|
# If these files don't exist then our assumptions have been violated and we should fail.
|
|
rm -v "$includedir/lix/libexpr/parser-tab.cc" "$includedir/lix/libexpr/lexer-tab.cc"
|