github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
7d33f6706f
fish-shell/cmake/Rust.cmake

75 lines
2.5 KiB
CMake
Raw Normal View History

cmake: add support for vendored cmake Use a "cmake-vendored" directory if it exists, to avoid accessing the network if it's available, and a target to create an appropriate tarball to create that directory.
2023-03-30 12:01:23 +08:00
if(EXISTS "${CMAKE_SOURCE_DIR}/corrosion-vendor/")
add_subdirectory("${CMAKE_SOURCE_DIR}/corrosion-vendor/")
else()
include(FetchContent)
# Don't let Corrosion's tests interfere with ours.
set(CORROSION_TESTS OFF CACHE BOOL "" FORCE)
FetchContent_Declare(
Corrosion
GIT_REPOSITORY https://github.com/mqudsi/corrosion
GIT_TAG fish
)
FetchContent_MakeAvailable(Corrosion)
add_custom_target(corrosion-vendor.tar.gz
COMMAND git archive --format tar.gz --output "${CMAKE_BINARY_DIR}/corrosion-vendor.tar.gz"
--prefix corrosion-vendor/ HEAD
WORKING_DIRECTORY ${corrosion_SOURCE_DIR}
)
endif()
Initial Rust commit
2023-01-15 06:56:24 +08:00
Use Rust for executables Use Rust for executables Drops the C++ entry points and restructures the Rust package into a library and three binary crates. Renames the fish-rust package to fish. At least on Ubuntu, "fish_indent" is built before "fish". Make sure export CURSES_LIBRARY_LIST to all binaries to make sure that "cached-curses-libnames" is populated. Closes #10198
2024-01-12 20:08:41 +08:00
set(fish_rust_target "fish")
Initial Rust commit
2023-01-15 06:56:24 +08:00
Turn FFI tests into native Rust tests Keep running tests serially to avoid breaking assumptions. I think many of these tests can run in parallel and/or don't need test_init(). Use the safe variant everywhere, to get it done faster.
2024-01-04 03:57:28 +08:00
set(FISH_CRATE_FEATURES)
Use `cargo build -Z build-std` for ASAN This is recommended and increases coverage.
2023-03-08 02:47:30 +08:00
if(NOT DEFINED CARGO_FLAGS)
# Corrosion doesn't like an empty string as FLAGS. This is basically a no-op alternative.
# See https://github.com/corrosion-rs/corrosion/issues/356
set(CARGO_FLAGS "--config" "foo=0")
endif()
if(DEFINED ASAN)
list(APPEND CARGO_FLAGS "-Z" "build-std")
Turn FFI tests into native Rust tests Keep running tests serially to avoid breaking assumptions. I think many of these tests can run in parallel and/or don't need test_init(). Use the safe variant everywhere, to get it done faster.
2024-01-04 03:57:28 +08:00
list(APPEND FISH_CRATE_FEATURES FEATURES "asan")
Use `cargo build -Z build-std` for ASAN This is recommended and increases coverage.
2023-03-08 02:47:30 +08:00
endif()
Initial Rust commit
2023-01-15 06:56:24 +08:00
corrosion_import_crate(
Use the workspace from CMake - Make CMake use the correct target-path - Make build.rs use the correct target dir Workspaces place it in the project root by default, the alternative to making this change is to add a `.cargo/config.toml` file with ```toml [build] target-dir = "fish-rust/target" ``` Which I think is unnecessary, as we likely want to use the new location anyways.
2023-08-13 21:33:36 +08:00
MANIFEST_PATH "${CMAKE_SOURCE_DIR}/Cargo.toml"
Use Rust for executables Use Rust for executables Drops the C++ entry points and restructures the Rust package into a library and three binary crates. Renames the fish-rust package to fish. At least on Ubuntu, "fish_indent" is built before "fish". Make sure export CURSES_LIBRARY_LIST to all binaries to make sure that "cached-curses-libnames" is populated. Closes #10198
2024-01-12 20:08:41 +08:00
CRATES "fish"
Turn FFI tests into native Rust tests Keep running tests serially to avoid breaking assumptions. I think many of these tests can run in parallel and/or don't need test_init(). Use the safe variant everywhere, to get it done faster.
2024-01-04 03:57:28 +08:00
"${FISH_CRATE_FEATURES}"
Use `cargo build -Z build-std` for ASAN This is recommended and increases coverage.
2023-03-08 02:47:30 +08:00
FLAGS "${CARGO_FLAGS}"
Initial Rust commit
2023-01-15 06:56:24 +08:00
)
test_cargo-test: use Corrosion target dir This makes "ninja test" write only to the build directory, not to the source tree. This enables our docker script which mounts the source as read-only.
2024-01-12 15:25:06 +08:00
if (Rust_CARGO_TARGET)
set(rust_target_dir "${CMAKE_BINARY_DIR}/cargo/build/${_CORROSION_RUST_CARGO_TARGET}")
else()
set(rust_target_dir "${CMAKE_BINARY_DIR}/cargo/build/${_CORROSION_RUST_CARGO_HOST_TARGET}")
endif()
Add rsconf build system and check for gettext symbols This is more complicated than it needs to be thanks to the presence of CMake and the C++ ffi in the picture. rsconf can correctly detect the required libraries and instruct rustc to link against them, but since we generate a static rust library and have CMake link it against the C++ binaries, we are still at the mercy of CMake picking up the symbols we want. Unfortunately, we could detect the gettext symbols but discover at runtime that they weren't linked in because CMake was compiled with `-DWITH_GETTEXT=0` or similar (as the macOS CI runner does). This means we also need to pass state between CMake and our build script to communicate which CMake options were enabled.
2023-05-17 02:02:22 +08:00
# Temporary hack to propogate CMake flags/options to build.rs. We need to get CMake to evaluate the
# truthiness of the strings if they are set.
set(CMAKE_WITH_GETTEXT "1")
if(DEFINED WITH_GETTEXT AND NOT "${WITH_GETTEXT}")
set(CMAKE_WITH_GETTEXT "0")
endif()
cmake: Canonicalize binary dir This would otherwise fail to set $fish_function_path to share/functions etc if run through a symlink.
2023-09-28 23:30:40 +08:00
# CMAKE_BINARY_DIR can include symlinks, since we want to compare this to the dir fish is executed in we need to canonicalize it.
file(REAL_PATH "${CMAKE_BINARY_DIR}" fish_binary_dir)
Link against curses in build.rs too This will allow to use "cargo test" for unit tests that depend on our curses.rs. This means that Rust.cmake depends on ConfigureChecks, so move that one to the front.
2024-01-04 03:02:32 +08:00
string(JOIN "," CURSES_LIBRARY_LIST ${CURSES_LIBRARY} ${CURSES_EXTRA_LIBRARY})
Initial Rust commit
2023-01-15 06:56:24 +08:00
# Tell Cargo where our build directory is so it can find config.h.
test_cargo-test: inherit same variables as Corrosion build targets In particular, pass the build directory, which is required in some test scenarios (see next commit).
2024-01-12 19:00:38 +08:00
set(VARS_FOR_CARGO
cmake: Canonicalize binary dir This would otherwise fail to set $fish_function_path to share/functions etc if run through a symlink.
2023-09-28 23:30:40 +08:00
"FISH_BUILD_DIR=${fish_binary_dir}"
Port path.h
2023-04-09 20:33:20 +08:00
"PREFIX=${CMAKE_INSTALL_PREFIX}"
Add rsconf build system and check for gettext symbols This is more complicated than it needs to be thanks to the presence of CMake and the C++ ffi in the picture. rsconf can correctly detect the required libraries and instruct rustc to link against them, but since we generate a static rust library and have CMake link it against the C++ binaries, we are still at the mercy of CMake picking up the symbols we want. Unfortunately, we could detect the gettext symbols but discover at runtime that they weren't linked in because CMake was compiled with `-DWITH_GETTEXT=0` or similar (as the macOS CI runner does). This means we also need to pass state between CMake and our build script to communicate which CMake options were enabled.
2023-05-17 02:02:22 +08:00
# Temporary hack to propogate CMake flags/options to build.rs.
"CMAKE_WITH_GETTEXT=${CMAKE_WITH_GETTEXT}"
cmake: Fix SYSCONFDIR and friends
2023-09-06 15:35:56 +08:00
"DOCDIR=${CMAKE_INSTALL_FULL_DOCDIR}"
"DATADIR=${CMAKE_INSTALL_FULL_DATADIR}"
"SYSCONFDIR=${CMAKE_INSTALL_FULL_SYSCONFDIR}"
"BINDIR=${CMAKE_INSTALL_FULL_BINDIR}"
Port wgettext wrapper from wutil.cpp This introduces a string allocations on lookups of strings that are not known at compile time; we should get rid of these allocations in future.
2024-01-02 03:39:38 +08:00
"LOCALEDIR=${CMAKE_INSTALL_FULL_LOCALEDIR}"
Link against curses in build.rs too This will allow to use "cargo test" for unit tests that depend on our curses.rs. This means that Rust.cmake depends on ConfigureChecks, so move that one to the front.
2024-01-04 03:02:32 +08:00
"CURSES_LIBRARY_LIST=${CURSES_LIBRARY_LIST}"
Drop CMake PCRE2 download/linking and allow statically-linked PCRE2 crate pcre2-sys includes a vendored copy of PCRE2, which allows for statically-linked PCRE2. Hook this up to the CMake build variable, and remove the C++ integration for PCRE2.
2024-01-13 14:17:50 +08:00
"${FISH_PCRE2_BUILDFLAG}"
Rust.cmake: break up long line
2023-04-19 22:45:25 +08:00
)
Reference in New Issue Copy Permalink