All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] build: allow to use rst2man from python3
@ 2018-08-31 15:29 Lucas De Marchi
  2018-08-31 17:33 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (3 more replies)
  0 siblings, 4 replies; 15+ messages in thread
From: Lucas De Marchi @ 2018-08-31 15:29 UTC (permalink / raw)
  To: igt-dev

While changing maintainer-tools to allow to use python3 I unsintalled my
python2 tools, which broke IGT build for me. Allow to use either
rst2man-3 or rst2man.

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 configure.ac    | 4 ++--
 man/Makefile.am | 2 +-
 man/meson.build | 4 ++--
 man/rst2man.sh  | 7 ++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index c75ef284..bcd24f04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,8 +52,8 @@ enable_gtk_doc=no
 ])
 
 # check for rst2man for generating man pages
-AC_CHECK_PROG(RST2MAN, rst2man, yes, no)
-AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" = xyes])
+AC_CHECK_PROGS(RST2MAN, rst2man-3 rst2man, "")
+AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" = x])
 
 # Checks for functions, headers, structures, etc.
 AC_HEADER_STDC
diff --git a/man/Makefile.am b/man/Makefile.am
index 777f5d1f..6b357b11 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -42,4 +42,4 @@ defs.rst:
 	$(AM_V_GEN)echo ".. |MANUAL_GROUP| replace:: General Commands Manual" >> $@
 
 %.$(APP_MAN_SUFFIX): %.rst defs.rst
-	$(AM_V_GEN)rst2man < $< > $@
+	$(AM_V_GEN)$(RST2MAN) < $< > $@
diff --git a/man/meson.build b/man/meson.build
index fa01f9dd..a6b08900 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -22,14 +22,14 @@ defs_rst = configure_file(input : 'defs.rst.in',
 		output : 'defs.rst',
 		configuration : config)
 
-rst2man = find_program('rst2man', required : _man_required)
+rst2man = find_program('rst2man-3', 'rst2man', required : _man_required)
 rst2man_script = find_program('rst2man.sh')
 
 if _build_man and rst2man.found()
 	foreach manpage : manpages
 		custom_target(manpage + '.1',
 				build_by_default : true,
-				command : [ rst2man_script, '@INPUT@', '@OUTPUT@' ],
+				command : [ rst2man_script, rst2man, '@INPUT@', '@OUTPUT@' ],
 				depend_files : [ defs_rst ],
 				input: manpage + '.rst',
 				output : manpage + '.1.gz',
diff --git a/man/rst2man.sh b/man/rst2man.sh
index 8106ca4b..49a98fc5 100755
--- a/man/rst2man.sh
+++ b/man/rst2man.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-input=$1
-output=$2
+rst2man=$1
+input=$2
+output=$3
 
 out_dir=$(dirname "${output}")
 in_file=$(basename "${input}")
@@ -10,7 +11,7 @@ in_file=$(basename "${input}")
 # generated we first need to move it all into the build dir
 cp "$input" "$out_dir"
 
-rst2man "$out_dir/$in_file" "${output%.gz}"
+${rst2man} "$out_dir/$in_file" "${output%.gz}"
 
 rm -f "${output}"
 gzip "${output%.gz}"
-- 
2.17.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [igt-dev] [PATCH i-g-t] build: allow to use rst2man from python3
@ 2018-09-05 18:43 Lucas De Marchi
  2018-09-06  6:06 ` Jani Nikula
  0 siblings, 1 reply; 15+ messages in thread
From: Lucas De Marchi @ 2018-09-05 18:43 UTC (permalink / raw)
  To: igt-dev

While changing maintainer-tools to allow to use python3 I unsintalled my
python2 tools, which broke IGT build for me. Allow to use either
rst2man-3 or rst2man.

v2: remove changes to autotools

Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
 man/meson.build | 4 ++--
 man/rst2man.sh  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/man/meson.build b/man/meson.build
index fa01f9dd..a6b08900 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -22,14 +22,14 @@ defs_rst = configure_file(input : 'defs.rst.in',
 		output : 'defs.rst',
 		configuration : config)
 
-rst2man = find_program('rst2man', required : _man_required)
+rst2man = find_program('rst2man-3', 'rst2man', required : _man_required)
 rst2man_script = find_program('rst2man.sh')
 
 if _build_man and rst2man.found()
 	foreach manpage : manpages
 		custom_target(manpage + '.1',
 				build_by_default : true,
-				command : [ rst2man_script, '@INPUT@', '@OUTPUT@' ],
+				command : [ rst2man_script, rst2man, '@INPUT@', '@OUTPUT@' ],
 				depend_files : [ defs_rst ],
 				input: manpage + '.rst',
 				output : manpage + '.1.gz',
diff --git a/man/rst2man.sh b/man/rst2man.sh
index 8106ca4b..49a98fc5 100755
--- a/man/rst2man.sh
+++ b/man/rst2man.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-input=$1
-output=$2
+rst2man=$1
+input=$2
+output=$3
 
 out_dir=$(dirname "${output}")
 in_file=$(basename "${input}")
@@ -10,7 +11,7 @@ in_file=$(basename "${input}")
 # generated we first need to move it all into the build dir
 cp "$input" "$out_dir"
 
-rst2man "$out_dir/$in_file" "${output%.gz}"
+${rst2man} "$out_dir/$in_file" "${output%.gz}"
 
 rm -f "${output}"
 gzip "${output%.gz}"
-- 
2.17.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2018-09-06  7:20 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-31 15:29 [igt-dev] [PATCH i-g-t] build: allow to use rst2man from python3 Lucas De Marchi
2018-08-31 17:33 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-09-01  3:11 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-09-03  9:44 ` [igt-dev] [PATCH i-g-t] " Petri Latvala
2018-09-04 11:56 ` Jani Nikula
2018-09-04 12:10   ` Daniel Vetter
2018-09-04 12:23     ` Jani Nikula
2018-09-04 16:00     ` Lucas De Marchi
2018-09-04 16:05       ` Lucas De Marchi
2018-09-04 18:35         ` Daniel Vetter
2018-09-05  9:06           ` Petri Latvala
2018-09-04 15:44   ` Lucas De Marchi
2018-09-05 18:43 Lucas De Marchi
2018-09-06  6:06 ` Jani Nikula
2018-09-06  7:20   ` Lucas De Marchi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.