diff options
| author | Qyriad <qyriad@qyriad.me> | 2024-04-04 11:57:45 -0600 |
|---|---|---|
| committer | Qyriad <qyriad@qyriad.me> | 2024-04-04 11:59:08 -0600 |
| commit | 9166babbaf5882ad2cfe1c7c9b30de1c153d70a8 (patch) | |
| tree | 7190dc0593332bc8391539e4cb0836c5a10f1d19 /doc/manual | |
| parent | b44514819bdb972b6e2beb6cd27efecb092ba514 (diff) | |
Revert "meson: move nix3 manpage generation into command-ref/"
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
Diffstat (limited to 'doc/manual')
| -rw-r--r-- | doc/manual/meson.build | 18 | ||||
| -rw-r--r-- | doc/manual/src/command-ref/meson.build | 16 |
2 files changed, 13 insertions, 21 deletions
diff --git a/doc/manual/meson.build b/doc/manual/meson.build index 72294311e..02b707ff3 100644 --- a/doc/manual/meson.build +++ b/doc/manual/meson.build @@ -132,10 +132,19 @@ nix3_cli_json = custom_target( capture : true, output : 'nix.json', ) - -# Creates nix3_cli_files custom target variable, -# which outputs the entire src/command-ref/new-cli directory. -subdir('src/command-ref') +nix3_cli_files = custom_target( + command : nix_eval_for_docs + [ + '--write-to', '@OUTPUT@', + '--expr', + 'import @INPUT1@ true (builtins.readFile @INPUT0@)', + ], + input : [ + nix3_cli_json, + 'generate-manpage.nix', + 'utils.nix', + ], + output : 'new-cli', +) nix3_manpages = [ 'nix3-build', @@ -236,7 +245,6 @@ foreach page : nix3_manpages '@OUTPUT@.tmp', '@OUTPUT@', ], - # nix3_cli_files set in doc/manual/src/command-ref/meson.build. input : nix3_cli_files, output : page + '.1', install : true, diff --git a/doc/manual/src/command-ref/meson.build b/doc/manual/src/command-ref/meson.build deleted file mode 100644 index c4043c882..000000000 --- a/doc/manual/src/command-ref/meson.build +++ /dev/null @@ -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', -) |