cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Revert "meson: move nix3 manpage generation into command-ref/"

Browse source 
This reverts commit 70954233743a233744787103d3211237a28ddbca.

This seems to have broken running ninja on warm build directories, which
is not what we want. Reverted until we figure out something better

Change-Id: I9623ae078917e7c59a930bf8044a216501d4bb20
This commit is contained in:
Qyriad 2024-04-04 11:57:45 -06:00
parent b44514819b
commit 9166babbaf
2 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/manual/meson.build
View file

@ -132,10 +132,19 @@ nix3_cli_json = custom_target(
capture : true, capture : true,
output : 'nix.json', output : 'nix.json',
) )
nix3_cli_files = custom_target(
# Creates nix3_cli_files custom target variable, command : nix_eval_for_docs + [
# which outputs the entire src/command-ref/new-cli directory. '--write-to', '@OUTPUT@',
subdir('src/command-ref') '--expr',
'import @INPUT1@ true (builtins.readFile @INPUT0@)',
],
input : [
nix3_cli_json,
'generate-manpage.nix',
'utils.nix',
],
output : 'new-cli',
)
nix3_manpages = [ nix3_manpages = [
'nix3-build', 'nix3-build',
@ -236,7 +245,6 @@ foreach page : nix3_manpages
'@OUTPUT@.tmp', '@OUTPUT@.tmp',
'@OUTPUT@', '@OUTPUT@',
], ],
# nix3_cli_files set in doc/manual/src/command-ref/meson.build.
input : nix3_cli_files, input : nix3_cli_files,
output : page + '.1', output : page + '.1',
install : true, install : true,

16
doc/manual/src/command-ref/meson.build
View file

@ -1,16 +0,0 @@
nix3_cli_files = custom_target(
'command-ref-new-cli',
command : nix_eval_for_docs + [
'--write-to', '@OUTPUT@',
'--expr',
'import @INPUT1@ true (builtins.readFile @INPUT0@)',
],
input : [
nix3_cli_json,
files(
meson.project_source_root() / 'doc/manual/generate-manpage.nix',
meson.project_source_root() / 'doc/manual/utils.nix',
),
],
output : 'new-cli',
)