mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-27 07:58:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'make-doc-generation-optional' into master

Browse source
This commit is contained in:
Daniel Eklöf 2020-09-24 16:40:44 +02:00
commit e3eb58d483
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -16,6 +16,13 @@
## Unreleased ## Unreleased
### Added ### Added
* `-Dwith-docs=disabled|enabled|auto` meson command line option. When
disabled, no documentation will be installed. This includes man
pages as well as `README.md`, `CHANGELOG.md` and `LICENSE`. Defaults
to `enabled`.
### Changed ### Changed
### Deprecated ### Deprecated
### Removed ### Removed

1
doc/meson.build
View file

@ -1,6 +1,5 @@
sh = find_program('sh', native: true) sh = find_program('sh', native: true)
scdoc = dependency('scdoc', native: true)
scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true) scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
foreach man_src : [{'name': 'foot', 'section' : 1}, foreach man_src : [{'name': 'foot', 'section' : 1},

26
meson.build
View file

@ -60,6 +60,9 @@ wayland_client = dependency('wayland-client')
wayland_cursor = dependency('wayland-cursor') wayland_cursor = dependency('wayland-cursor')
xkb = dependency('xkbcommon') xkb = dependency('xkbcommon')
fontconfig = dependency('fontconfig') fontconfig = dependency('fontconfig')
scdoc = dependency('scdoc', native: true, required: get_option('with-docs'))
build_and_install_docs = scdoc.found()
tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist') tllist = dependency('tllist', version: '>=1.0.4', fallback: 'tllist')
fcft = dependency('fcft', version: ['>=2.3.0', '<3.0.0'], fallback: 'fcft') fcft = dependency('fcft', version: ['>=2.3.0', '<3.0.0'], fallback: 'fcft')
@ -157,21 +160,24 @@ custom_target(
install: true, install: true,
install_dir: join_paths(get_option('datadir'), 'terminfo')) install_dir: join_paths(get_option('datadir'), 'terminfo'))
install_data(
'LICENSE', 'README.md', 'CHANGELOG.md',
install_dir: join_paths(get_option('datadir'), 'doc', 'foot'))
install_data( install_data(
'foot.desktop', 'foot-server.desktop', 'foot.desktop', 'foot-server.desktop',
install_dir: join_paths(get_option('datadir'), 'applications')) install_dir: join_paths(get_option('datadir'), 'applications'))
install_data('foot.ini', install_dir: join_paths(get_option('datadir'), 'foot')) install_data('foot.ini', install_dir: join_paths(get_option('datadir'), 'foot'))
subdir('completions') subdir('completions')
subdir('doc')
subdir('icons') subdir('icons')
# summary( if build_and_install_docs
# { install_data(
# '<feature>': false, 'LICENSE', 'README.md', 'CHANGELOG.md',
# }, install_dir: join_paths(get_option('datadir'), 'doc', 'foot'))
# bool_yn: true subdir('doc')
# ) endif
summary(
{
'Documentation': build_and_install_docs,
},
bool_yn: true
)

2
meson_options.txt Normal file
View file

@ -0,0 +1,2 @@
option('with-docs', type: 'feature', value: 'enabled',
description: 'generate and install documentation (man pages). Requires scdoc.')