From c2a7d367af8630fbc31b79146af76081c258c8ba Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 11 May 2018 08:39:46 -0400 Subject: Wire up scdoc and rewrite sway(1) --- meson.build | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index f59d29b3..d1693ace 100644 --- a/meson.build +++ b/meson.build @@ -40,7 +40,6 @@ libpam = cc.find_library('pam') math = cc.find_library('m') rt = cc.find_library('rt') git = find_program('git', required: false) -a2x = find_program('a2x', required: false) conf_data = configuration_data() @@ -48,31 +47,25 @@ if gdk_pixbuf.found() conf_data.set('HAVE_GDK_PIXBUF', true) endif -if a2x.found() +scdoc = find_program('scdoc', required: false) + +if scdoc.found() + sh = find_program('sh') mandir = get_option('mandir') man_files = [ - 'sway/sway.1.txt', - 'sway/sway.5.txt', - 'sway/sway-bar.5.txt', - 'sway/sway-input.5.txt', - 'sway/sway-security.7.txt', - 'swaymsg/swaymsg.1.txt', + 'sway/sway.1.scd', ] foreach filename : man_files topic = filename.split('.')[-3].split('/')[-1] section = filename.split('.')[-2] + output = '@0@.@1@'.format(topic, section) custom_target( - 'man-@0@-@1@'.format(topic, section), + output, input: filename, - output: '@BASENAME@', + output: output, command: [ - a2x, - '--no-xmllint', - '--doctype', 'manpage', - '--format', 'manpage', - '--destination-dir', meson.current_build_dir(), - '@INPUT@' + sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.path(), output) ], install: true, install_dir: '@0@/man@1@'.format(mandir, section) -- cgit v1.2.3 From 432256ad84af0b6ef62ff92fe3248d2ce8ceffd4 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 11 May 2018 20:58:34 -0400 Subject: Add sway(5) --- meson.build | 1 + 1 file changed, 1 insertion(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index d1693ace..38590444 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,7 @@ if scdoc.found() mandir = get_option('mandir') man_files = [ 'sway/sway.1.scd', + 'sway/sway.5.scd', ] foreach filename : man_files topic = filename.split('.')[-3].split('/')[-1] -- cgit v1.2.3 From 18134822666691a25050eff1a46df82a4108de3f Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 11 May 2018 21:13:43 -0400 Subject: Add sway-bar(5) --- meson.build | 1 + 1 file changed, 1 insertion(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 38590444..6b0f6a15 100644 --- a/meson.build +++ b/meson.build @@ -55,6 +55,7 @@ if scdoc.found() man_files = [ 'sway/sway.1.scd', 'sway/sway.5.scd', + 'sway/sway-bar.5.scd', ] foreach filename : man_files topic = filename.split('.')[-3].split('/')[-1] -- cgit v1.2.3 From d9a08b7a9df64ba434252d6adfa08aabb4c5c31e Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 11 May 2018 21:25:05 -0400 Subject: Add sway-input(5) --- meson.build | 1 + 1 file changed, 1 insertion(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 6b0f6a15..1e303e72 100644 --- a/meson.build +++ b/meson.build @@ -56,6 +56,7 @@ if scdoc.found() 'sway/sway.1.scd', 'sway/sway.5.scd', 'sway/sway-bar.5.scd', + 'sway/sway-input.5.scd', ] foreach filename : man_files topic = filename.split('.')[-3].split('/')[-1] -- cgit v1.2.3 From 22f52b91ed178cf402fe3fc857bbfd351a753b1d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 11 May 2018 21:39:47 -0400 Subject: Add swaylock(1) and swaymsg(1) --- meson.build | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 1e303e72..a1f406ec 100644 --- a/meson.build +++ b/meson.build @@ -57,6 +57,8 @@ if scdoc.found() 'sway/sway.5.scd', 'sway/sway-bar.5.scd', 'sway/sway-input.5.scd', + 'swaylock/swaylock.1.scd', + 'swaymsg/swaymsg.1.scd', ] foreach filename : man_files topic = filename.split('.')[-3].split('/')[-1] -- cgit v1.2.3