Skip to content

Commit 60c48b7

Browse files
authored
Merge pull request #13501 from k1gen/fix-rsync-requirement
Require rsync in nix-manual meson.build
2 parents 599c1d7 + cfb8a31 commit 60c48b7

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

doc/manual/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ nix = find_program('nix', native : true)
88

99
mdbook = find_program('mdbook', native : true)
1010
bash = find_program('bash', native : true)
11+
rsync = find_program('rsync', required: true, native: true)
1112

1213
pymod = import('python')
1314
python = pymod.find_installation('python3')
@@ -84,7 +85,7 @@ manual = custom_target(
8485
@0@ @INPUT0@ @CURRENT_SOURCE_DIR@ > @DEPFILE@
8586
@0@ @INPUT1@ summary @2@ < @CURRENT_SOURCE_DIR@/source/SUMMARY.md.in > @2@/source/SUMMARY.md
8687
sed -e 's|@version@|@3@|g' < @INPUT2@ > @2@/book.toml
87-
rsync -r --include='*.md' @CURRENT_SOURCE_DIR@/ @2@/
88+
@4@ -r --include='*.md' @CURRENT_SOURCE_DIR@/ @2@/
8889
(cd @2@; RUST_LOG=warn @1@ build -d @2@ 3>&2 2>&1 1>&3) | { grep -Fv "because fragment resolution isn't implemented" || :; } 3>&2 2>&1 1>&3
8990
rm -rf @2@/manual
9091
mv @2@/html @2@/manual
@@ -94,6 +95,7 @@ manual = custom_target(
9495
mdbook.full_path(),
9596
meson.current_build_dir(),
9697
meson.project_version(),
98+
rsync.full_path(),
9799
),
98100
],
99101
input : [

0 commit comments

Comments
 (0)