1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id CB9CA431FB6
\r
6 for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 11:44:48 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=1.739 tagged_above=-999 required=5
\r
12 tests=[DNS_FROM_AHBL_RHSBL=2.438, HTML_MESSAGE=0.001,
\r
13 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id Oi5jKMAruayZ for <notmuch@notmuchmail.org>;
\r
17 Sun, 18 Jan 2015 11:44:45 -0800 (PST)
\r
18 Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com
\r
19 [209.85.217.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 486A2431FAF
\r
22 for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 11:44:45 -0800 (PST)
\r
23 Received: by mail-lb0-f182.google.com with SMTP id u10so24968968lbd.13
\r
24 for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 11:44:42 -0800 (PST)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=1e100.net; s=20130820;
\r
27 h=x-gm-message-state:mime-version:in-reply-to:references:date
\r
28 :message-id:subject:from:to:cc:content-type;
\r
29 bh=kNPFNURgMPqn3UFKH1gt0E7cm6sDrl2mBGmWYXelfik=;
\r
30 b=IDONrnndH8mnzuWuHvg6+HaOKIvz2umXle6NpnepSkYEznHSODS8tOlXmoSfvopCsO
\r
31 gmMC7qKGP/ET4Epg99FJK0NKepsWME8i9J0pJ7CkzLlytccpK195V+HD5v4sDJMzkXI1
\r
32 4OgRH2cF77xvl7RcNkgPGZbyiCx4WUdKYJo8eIdtUJ8+eGHHNOLZDW+sD70NnIRDd/Y+
\r
33 FNiDkK9jtT2eHShXjlj5mSKqeaI6d1TOgrpAZ5cX/4wur6eNPRt0Ic4wGRnO9EpNSqIT
\r
34 7tTtCqAAS89dSON4TrRVgzj47juafI/nFFxGspdAt2qiFG5+Mc6EjwoSsEBv9JJWC+1s
\r
37 ALoCoQlBOxQNZfV5h791Faadf7dseXUs0ppP5lwNWsrm6uMIvHlG0zTXQrnJBu9Sx63s75TBYX0v
\r
39 X-Received: by 10.112.119.167 with SMTP id kv7mr26201348lbb.62.1421610282610;
\r
40 Sun, 18 Jan 2015 11:44:42 -0800 (PST)
\r
41 Received: by 10.25.160.143 with HTTP; Sun, 18 Jan 2015 11:44:42 -0800 (PST)
\r
42 Received: by 10.25.160.143 with HTTP; Sun, 18 Jan 2015 11:44:42 -0800 (PST)
\r
43 In-Reply-To: <1421600110-19988-1-git-send-email-david@tethera.net>
\r
44 References: <87k312x4i2.fsf@maritornes.cs.unb.ca>
\r
45 <1421600110-19988-1-git-send-email-david@tethera.net>
\r
46 Date: Sun, 18 Jan 2015 21:44:42 +0200
\r
48 <CAB+hUn_Uxj2Ozsw8ymLxMk0RZ6g9kYjM+GLzcX6zrQt4rhMMOQ@mail.gmail.com>
\r
49 Subject: Re: [PATCH] doc: remove support for rst2man
\r
50 From: Jani Nikula <jani@nikula.org>
\r
51 To: David Bremner <david@tethera.net>
\r
52 Content-Type: multipart/alternative; boundary=047d7b874450e78936050cf26f93
\r
53 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
54 X-BeenThere: notmuch@notmuchmail.org
\r
55 X-Mailman-Version: 2.1.13
\r
57 List-Id: "Use and development of the notmuch mail system."
\r
58 <notmuch.notmuchmail.org>
\r
59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
62 List-Post: <mailto:notmuch@notmuchmail.org>
\r
63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
66 X-List-Received-Date: Sun, 18 Jan 2015 19:44:48 -0000
\r
68 --047d7b874450e78936050cf26f93
\r
69 Content-Type: text/plain; charset=UTF-8
\r
71 On Jan 18, 2015 6:56 PM, "David Bremner" <david@tethera.net> wrote:
\r
73 > It was becoming increasingly complicated to support rst2man, and there
\r
74 > were apparently not many people that relied on it.
\r
77 > Now's your chance to tell us how useful rst2man support is to you.
\r
79 > INSTALL | 7 ++----
\r
81 > configure | 20 +++--------------
\r
82 > doc/INSTALL | 13 -----------
\r
83 > doc/Makefile.local | 7 ++----
\r
84 > doc/prerst2man.py | 64
\r
85 ------------------------------------------------------
\r
86 > 6 files changed, 13 insertions(+), 104 deletions(-)
\r
87 > delete mode 100644 doc/prerst2man.py
\r
89 > diff --git a/INSTALL b/INSTALL
\r
90 > index b543c50..eaccd93 100644
\r
93 > @@ -75,14 +75,11 @@ Talloc, and zlib which are each described below:
\r
94 > Building Documentation
\r
95 > ----------------------
\r
97 > -By default the documentation for notmuch is built using sphinx.
\r
98 > +To build the documentation for notmuch you need at least version 1.0
\r
99 > +of sphinx (Jul. 2010).
\r
101 > Sphinx is available from www.sphinx-doc.org.
\r
103 > -If you prefer, you can build the man pages using rst2man, from the
\r
104 > -python docutils package. See doc/INSTALL for details.
\r
107 > Installing Dependencies from Packages
\r
108 > -------------------------------------
\r
110 > diff --git a/NEWS b/NEWS
\r
111 > index abb5ad7..53e06aa 100644
\r
115 > Notmuch 0.20 (UNRELEASED)
\r
120 > +Support for using rst2man in place of sphinx to build the
\r
121 > +docmumentation has been removed.
\r
133 > diff --git a/configure b/configure
\r
134 > index 137acea..a6b49ae 100755
\r
137 > @@ -447,19 +447,9 @@ printf "Checking if sphinx is available and supports
\r
139 > if hash sphinx-build > /dev/null 2>&1 && ${python} -m
\r
140 sphinx.writers.manpage > /dev/null 2>&1 ; then
\r
145 > - printf "No (falling back to rst2man).\n"
\r
146 > + printf "No (so will not install man pages).\n"
\r
149 > - printf "Checking if rst2man is available... "
\r
150 > - if rst2man -V > /dev/null 2>&1; then
\r
151 > - printf "Yes.\n"
\r
154 > - printf "No (so will not install man pages).\n"
\r
159 > libdir_in_ldconfig=0
\r
160 > @@ -848,9 +838,6 @@ HAVE_EMACS = ${have_emacs}
\r
161 > # Whether there's a sphinx-build binary available for building
\r
163 > HAVE_SPHINX=${have_sphinx}
\r
165 > -# Whether there's a rst2man binary available for building documentation
\r
166 > -HAVE_RST2MAN=${have_rst2man}
\r
168 > # Whether there's a doxygen binary available for building api
\r
170 > HAVE_DOXYGEN=${have_doxygen}
\r
172 > @@ -978,9 +965,8 @@ cat > sh.config <<EOF
\r
173 > # Whether the Xapian version in use supports compaction
\r
174 > NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
\r
176 > -# Whether there's either sphinx or rst2man available for building
\r
178 > -NOTMUCH_HAVE_MAN=$((have_sphinx || have_rst2man))
\r
179 > +# do we have man pages?
\r
180 > +NOTMUCH_HAVE_MAN=$((have_sphinx))
\r
182 > # Name of python interpreter
\r
183 > NOTMUCH_PYTHON=${python}
\r
184 > diff --git a/doc/INSTALL b/doc/INSTALL
\r
185 > index e37c2b9..0585476 100644
\r
186 > --- a/doc/INSTALL
\r
187 > +++ b/doc/INSTALL
\r
189 > This file contains some more detailed information about building and
\r
190 > installing the documentation.
\r
192 > -Building with sphinx.
\r
193 > ----------------------
\r
195 > - You need sphinx at least version 1.0.
\r
197 > - You can build build and install man pages with 'make install-man'
\r
198 > @@ -12,13 +9,3 @@ Building with sphinx.
\r
199 > (currently only the man pages) with
\r
201 > 'make install-{man|info|html|pdf}'
\r
203 > -Building the man pages
\r
204 > -----------------------
\r
206 > -- You can build the man pages with rst2man (from python-docutils) with
\r
207 > - 'make rst2man'.
\r
209 > -- Currently there is no support to automagically install the resulting
\r
210 > - nroff files, but it should work to modify the target install-man
\r
211 > - in doc/Makefile.local.
\r
212 > diff --git a/doc/Makefile.local b/doc/Makefile.local
\r
213 > index e7d0bac..0bdf2e1 100644
\r
214 > --- a/doc/Makefile.local
\r
215 > +++ b/doc/Makefile.local
\r
216 > @@ -7,7 +7,6 @@ SPHINXOPTS := -q
\r
217 > SPHINXBUILD = sphinx-build
\r
218 > DOCBUILDDIR := $(dir)/_build
\r
220 > -prerst2man := python $(srcdir)/$(dir)/prerst2man.py
\r
221 > mkdocdeps := python $(srcdir)/$(dir)/mkdocdeps.py
\r
223 > # Internal variables.
\r
224 > @@ -50,8 +49,6 @@ ifeq ($(HAVE_SPHINX),1)
\r
225 > mkdir -p $(DOCBUILDDIR)/man/man$${section}; \
\r
226 > mv $(DOCBUILDDIR)/man/*.$${section}
\r
227 $(DOCBUILDDIR)/man/man$${section}; \
\r
229 > -else ifeq ($(HAVE_RST2MAN),1)
\r
230 > - $(prerst2man) $(srcdir)/doc $(DOCBUILDDIR)/man
\r
232 > @echo "Fatal: build dependency fail."
\r
234 > @@ -79,10 +76,10 @@ endif
\r
236 > # Do not try to build or install man pages if a man page converter is
\r
238 > -ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)
\r
239 > +ifeq ($(HAVE_SPHINX),0)
\r
242 > - @echo "No sphinx or rst2man, will not install man pages."
\r
243 > + @echo "No sphinx, will not install man pages."
\r
245 > build-man: ${MAN_GZIP_FILES}
\r
246 > install-man: ${MAN_GZIP_FILES}
\r
247 > diff --git a/doc/prerst2man.py b/doc/prerst2man.py
\r
248 > deleted file mode 100644
\r
249 > index 968722a..0000000
\r
250 > --- a/doc/prerst2man.py
\r
253 > -from sys import argv
\r
254 > -from datetime import date
\r
255 > -from os.path import dirname, isdir
\r
256 > -from os import makedirs, system
\r
259 > -sourcedir = argv[1]
\r
260 > -outdir = argv[2]
\r
262 > -if not isdir(outdir):
\r
263 > - makedirs(outdir, 0o755)
\r
265 > -with open(sourcedir + "/conf.py") as cf:
\r
266 > - exec(cf.read())
\r
269 > -def header(file, startdocname, command, description, authors, section):
\r
277 > -:Manual section: {5:d}
\r
278 > -:Manual group: {6:s}
\r
281 > -'-' * len(description),
\r
283 > -'-' * len(description),
\r
284 > -date.today().isoformat(), release, section, project))
\r
286 > -blankre = re.compile("^\s*$")
\r
287 > -for page in man_pages:
\r
288 > - outdirname = outdir + '/' + dirname(page[0])
\r
289 > - if not isdir(outdirname):
\r
290 > - makedirs(outdirname, 0o755)
\r
291 > - filename = outdir + '/' + page[0] + '.rst'
\r
292 > - outfile = open(filename, 'w')
\r
293 > - infile = open(sourcedir + '/' + page[0] + '.rst', 'r')
\r
295 > - # this is a crude hack. We look for the first blank line, and
\r
296 > - # insert the rst2man header there.
\r
298 > - # XXX consider really parsing input
\r
301 > - lines = infile.readlines()
\r
302 > - for line in lines:
\r
303 > - outfile.write(line)
\r
304 > - if (blankre.match(line)):
\r
306 > - count = count + 1
\r
308 > - del lines[0:count + 1]
\r
310 > - header(outfile, *page)
\r
312 > - outfile.write("".join(lines))
\r
313 > - outfile.close()
\r
315 > - system('set -x; rst2man {0} {1}/{2}.{3}'
\r
316 > - .format(filename, outdir, page[0], page[4]))
\r
320 > _______________________________________________
\r
321 > notmuch mailing list
\r
322 > notmuch@notmuchmail.org
\r
323 > http://notmuchmail.org/mailman/listinfo/notmuch
\r
325 --047d7b874450e78936050cf26f93
\r
326 Content-Type: text/html; charset=UTF-8
\r
327 Content-Transfer-Encoding: quoted-printable
\r
329 <p dir=3D"ltr"><br>
\r
330 On Jan 18, 2015 6:56 PM, "David Bremner" <<a href=3D"mailto:da=
\r
331 vid@tethera.net">david@tethera.net</a>> wrote:<br>
\r
333 > It was becoming increasingly complicated to support rst2man, and there=
\r
335 > were apparently not many people that relied on it.<br>
\r
338 > Now's your chance to tell us how useful rst2man support is to you.=
\r
341 > =C2=A0INSTALL=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 7 ++---=
\r
343 > =C2=A0NEWS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=
\r
345 > =C2=A0configure=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 20 +++------------=
\r
347 > =C2=A0doc/INSTALL=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 13 -----------<br>
\r
348 > =C2=A0doc/Makefile.local |=C2=A0 7 ++----<br>
\r
349 > =C2=A0doc/prerst2man.py=C2=A0 | 64 -----------------------------------=
\r
350 -------------------<br>
\r
351 > =C2=A06 files changed, 13 insertions(+), 104 deletions(-)<br>
\r
352 > =C2=A0delete mode 100644 doc/prerst2man.py<br>
\r
354 > diff --git a/INSTALL b/INSTALL<br>
\r
355 > index b543c50..eaccd93 100644<br>
\r
356 > --- a/INSTALL<br>
\r
357 > +++ b/INSTALL<br>
\r
358 > @@ -75,14 +75,11 @@ Talloc, and zlib which are each described below:<b=
\r
360 > =C2=A0Building Documentation<br>
\r
361 > =C2=A0----------------------<br>
\r
363 > -By default the documentation for notmuch is built using sphinx.<br>
\r
364 > +To build the documentation for notmuch you need at least version 1.0<=
\r
366 > +of sphinx (Jul. 2010).<br>
\r
368 > =C2=A0Sphinx is available from <a href=3D"http://www.sphinx-doc.org">w=
\r
369 ww.sphinx-doc.org</a>.<br>
\r
371 > -If you prefer, you can build the man pages using rst2man, from the<br=
\r
373 > -python docutils package. See doc/INSTALL for details.<br>
\r
376 > =C2=A0Installing Dependencies from Packages<br>
\r
377 > =C2=A0-------------------------------------<br>
\r
379 > diff --git a/NEWS b/NEWS<br>
\r
380 > index abb5ad7..53e06aa 100644<br>
\r
381 > --- a/NEWS<br>
\r
382 > +++ b/NEWS<br>
\r
383 > @@ -1,5 +1,11 @@<br>
\r
384 > =C2=A0Notmuch 0.20 (UNRELEASED)<br>
\r
386 > +Documentation<br>
\r
387 > +-------------<br>
\r
389 > +Support for using rst2man in place of sphinx to build the<br>
\r
390 > +docmumentation has been removed.</p>
\r
391 <p dir=3D"ltr">-mu</p>
\r
392 <p dir=3D"ltr">Otherwise lgtm.</p>
\r
393 <p dir=3D"ltr">Jani.<br></p>
\r
394 <p dir=3D"ltr">> +<br>
\r
395 > =C2=A0Contrib<br>
\r
396 > =C2=A0-------<br>
\r
398 > diff --git a/configure b/configure<br>
\r
399 > index 137acea..a6b49ae 100755<br>
\r
400 > --- a/configure<br>
\r
401 > +++ b/configure<br>
\r
402 > @@ -447,19 +447,9 @@ printf "Checking if sphinx is available and =
\r
403 supports nroff output... "<br>
\r
404 > =C2=A0if hash sphinx-build > /dev/null 2>&1 && ${pyt=
\r
405 hon} -m sphinx.writers.manpage > /dev/null 2>&1 ; then<br>
\r
406 > =C2=A0 =C2=A0 =C2=A0printf "Yes.\n"<br>
\r
407 > =C2=A0 =C2=A0 =C2=A0have_sphinx=3D1<br>
\r
408 > -=C2=A0 =C2=A0 have_rst2man=3D0<br>
\r
409 > =C2=A0else<br>
\r
410 > -=C2=A0 =C2=A0 printf "No (falling back to rst2man).\n"<br>
\r
411 > +=C2=A0 =C2=A0 printf "No (so will not install man pages).\n"=
\r
413 > =C2=A0 =C2=A0 =C2=A0have_sphinx=3D0<br>
\r
415 > -=C2=A0 =C2=A0 printf "Checking if rst2man is available... "=
\r
417 > -=C2=A0 =C2=A0 if rst2man -V > /dev/null 2>&1; then<br>
\r
418 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0printf "Yes.\n"<br>
\r
419 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0have_rst2man=3D1<br>
\r
420 > -=C2=A0 =C2=A0 else<br>
\r
421 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0printf "No (so will not install man p=
\r
423 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0have_rst2man=3D0<br>
\r
424 > -=C2=A0 =C2=A0 fi<br>
\r
427 > =C2=A0libdir_in_ldconfig=3D0<br>
\r
428 > @@ -848,9 +838,6 @@ HAVE_EMACS =3D ${have_emacs}<br>
\r
429 > =C2=A0# Whether there's a sphinx-build binary available for buildi=
\r
430 ng documentation<br>
\r
431 > =C2=A0HAVE_SPHINX=3D${have_sphinx}<br>
\r
433 > -# Whether there's a rst2man binary available for building documen=
\r
435 > -HAVE_RST2MAN=3D${have_rst2man}<br>
\r
437 > =C2=A0# Whether there's a doxygen binary available for building ap=
\r
438 i documentation<br>
\r
439 > =C2=A0HAVE_DOXYGEN=3D${have_doxygen}<br>
\r
441 > @@ -978,9 +965,8 @@ cat > sh.config <<EOF<br>
\r
442 > =C2=A0# Whether the Xapian version in use supports compaction<br>
\r
443 > =C2=A0NOTMUCH_HAVE_XAPIAN_COMPACT=3D${have_xapian_compact}<br>
\r
445 > -# Whether there's either sphinx or rst2man available for building=
\r
447 > -# documentation<br>
\r
448 > -NOTMUCH_HAVE_MAN=3D$((have_sphinx || have_rst2man))<br>
\r
449 > +# do we have man pages?<br>
\r
450 > +NOTMUCH_HAVE_MAN=3D$((have_sphinx))<br>
\r
452 > =C2=A0# Name of python interpreter<br>
\r
453 > =C2=A0NOTMUCH_PYTHON=3D${python}<br>
\r
454 > diff --git a/doc/INSTALL b/doc/INSTALL<br>
\r
455 > index e37c2b9..0585476 100644<br>
\r
456 > --- a/doc/INSTALL<br>
\r
457 > +++ b/doc/INSTALL<br>
\r
458 > @@ -1,9 +1,6 @@<br>
\r
459 > =C2=A0This file contains some more detailed information about building=
\r
461 > =C2=A0installing the documentation.<br>
\r
463 > -Building with sphinx.<br>
\r
464 > ----------------------<br>
\r
466 > =C2=A0- You need sphinx at least version 1.0.<br>
\r
468 > =C2=A0- You can build build and install man pages with 'make insta=
\r
470 > @@ -12,13 +9,3 @@ Building with sphinx.<br>
\r
471 > =C2=A0 =C2=A0(currently only the man pages) with<br>
\r
473 > =C2=A0 =C2=A0 =C2=A0 'make install-{man|info|html|pdf}'<br>
\r
475 > -Building the man pages<br>
\r
476 > -----------------------<br>
\r
478 > -- You can build the man pages with rst2man (from python-docutils) wit=
\r
480 > -=C2=A0 'make rst2man'.<br>
\r
482 > -- Currently there is no support to automagically install the resultin=
\r
484 > -=C2=A0 nroff files, but it should work to modify the target install-m=
\r
486 > -=C2=A0 in doc/Makefile.local.<br>
\r
487 > diff --git a/doc/Makefile.local b/doc/Makefile.local<br>
\r
488 > index e7d0bac..0bdf2e1 100644<br>
\r
489 > --- a/doc/Makefile.local<br>
\r
490 > +++ b/doc/Makefile.local<br>
\r
491 > @@ -7,7 +7,6 @@ SPHINXOPTS=C2=A0 =C2=A0 :=3D -q<br>
\r
492 > =C2=A0SPHINXBUILD=C2=A0 =C2=A0=3D sphinx-build<br>
\r
493 > =C2=A0DOCBUILDDIR=C2=A0 =C2=A0 =C2=A0 :=3D $(dir)/_build<br>
\r
495 > -prerst2man :=3D python $(srcdir)/$(dir)/prerst2man.py<br>
\r
496 > =C2=A0mkdocdeps :=3D python $(srcdir)/$(dir)/mkdocdeps.py<br>
\r
498 > =C2=A0# Internal variables.<br>
\r
499 > @@ -50,8 +49,6 @@ ifeq ($(HAVE_SPHINX),1)<br>
\r
500 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mkdir -p $(DOCBUILDDIR)/man/=
\r
501 man$${section}; \<br>
\r
502 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mv $(DOCBUILDDIR)/man/*.$${s=
\r
503 ection} $(DOCBUILDDIR)/man/man$${section}; \<br>
\r
504 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 done<br>
\r
505 > -else ifeq ($(HAVE_RST2MAN),1)<br>
\r
506 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0$(prerst2man) $(srcdir)/doc $(DOCBUILDDIR)=
\r
508 > =C2=A0else<br>
\r
509 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 @echo "Fatal: build dependency fail.&=
\r
511 > =C2=A0 =C2=A0 =C2=A0 =C2=A0 @false<br>
\r
512 > @@ -79,10 +76,10 @@ endif<br>
\r
514 > =C2=A0# Do not try to build or install man pages if a man page convert=
\r
516 > =C2=A0# not available.<br>
\r
517 > -ifeq ($(HAVE_SPHINX)$(HAVE_RST2MAN),00)<br>
\r
518 > +ifeq ($(HAVE_SPHINX),0)<br>
\r
519 > =C2=A0build-man:<br>
\r
520 > =C2=A0install-man:<br>
\r
521 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0@echo "No sphinx or rst2man, will not=
\r
522 install man pages."<br>
\r
523 > +=C2=A0 =C2=A0 =C2=A0 =C2=A0@echo "No sphinx, will not install ma=
\r
525 > =C2=A0else<br>
\r
526 > =C2=A0build-man: ${MAN_GZIP_FILES}<br>
\r
527 > =C2=A0install-man: ${MAN_GZIP_FILES}<br>
\r
528 > diff --git a/doc/prerst2man.py b/doc/prerst2man.py<br>
\r
529 > deleted file mode 100644<br>
\r
530 > index 968722a..0000000<br>
\r
531 > --- a/doc/prerst2man.py<br>
\r
532 > +++ /dev/null<br>
\r
533 > @@ -1,64 +0,0 @@<br>
\r
534 > -from sys import argv<br>
\r
535 > -from datetime import date<br>
\r
536 > -from os.path import dirname, isdir<br>
\r
537 > -from os import makedirs, system<br>
\r
538 > -import re<br>
\r
540 > -sourcedir =3D argv[1]<br>
\r
541 > -outdir =3D argv[2]<br>
\r
543 > -if not isdir(outdir):<br>
\r
544 > -=C2=A0 =C2=A0 makedirs(outdir, 0o755)<br>
\r
546 > -with open(sourcedir + "/conf.py") as cf:<br>
\r
547 > -=C2=A0 =C2=A0 exec(cf.read())<br>
\r
550 > -def header(file, startdocname, command, description, authors, section=
\r
552 > -=C2=A0 =C2=A0 file.write("""<br>
\r
557 > -:Date:=C2=A0 =C2=A0{3:s}<br>
\r
558 > -:Version: {4:s}<br>
\r
559 > -:Manual section: {5:d}<br>
\r
560 > -:Manual group: {6:s}<br>
\r
562 > -""".format(<br>
\r
563 > -'-' * len(description),<br>
\r
564 > -description,<br>
\r
565 > -'-' * len(description),<br>
\r
566 > -date.today().isoformat(), release, section, project))<br>
\r
568 > -blankre =3D re.compile("^\s*$")<br>
\r
569 > -for page in man_pages:<br>
\r
570 > -=C2=A0 =C2=A0 outdirname =3D outdir + '/' + dirname(page[0])<=
\r
572 > -=C2=A0 =C2=A0 if not isdir(outdirname):<br>
\r
573 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 makedirs(outdirname, 0o755)<br>
\r
574 > -=C2=A0 =C2=A0 filename =3D outdir + '/' + page[0] + '.rst=
\r
576 > -=C2=A0 =C2=A0 outfile =3D open(filename, 'w')<br>
\r
577 > -=C2=A0 =C2=A0 infile =3D open(sourcedir + '/' + page[0] + =
\r
578 9;.rst', 'r')<br>
\r
580 > -=C2=A0 =C2=A0 # this is a crude hack. We look for the first blank lin=
\r
582 > -=C2=A0 =C2=A0 # insert the rst2man header there.<br>
\r
583 > -=C2=A0 =C2=A0 #<br>
\r
584 > -=C2=A0 =C2=A0 # XXX consider really parsing input<br>
\r
586 > -=C2=A0 =C2=A0 count =3D 0<br>
\r
587 > -=C2=A0 =C2=A0 lines =3D infile.readlines()<br>
\r
588 > -=C2=A0 =C2=A0 for line in lines:<br>
\r
589 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 outfile.write(line)<br>
\r
590 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (blankre.match(line)):<br>
\r
591 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 break<br>
\r
592 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 count =3D count + 1<br>
\r
594 > -=C2=A0 =C2=A0 del lines[0:count + 1]<br>
\r
596 > -=C2=A0 =C2=A0 header(outfile, *page)<br>
\r
598 > -=C2=A0 =C2=A0 outfile.write("".join(lines))<br>
\r
599 > -=C2=A0 =C2=A0 outfile.close()<br>
\r
601 > -=C2=A0 =C2=A0 system('set -x; rst2man {0} {1}/{2}.{3}'<br>
\r
602 > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.format(filename, outdir, pa=
\r
603 ge[0], page[4]))<br>
\r
607 > _______________________________________________<br>
\r
608 > notmuch mailing list<br>
\r
609 > <a href=3D"mailto:notmuch@notmuchmail.org">notmuch@notmuchmail.org</a>=
\r
611 > <a href=3D"http://notmuchmail.org/mailman/listinfo/notmuch">http://not=
\r
612 muchmail.org/mailman/listinfo/notmuch</a><br>
\r
615 --047d7b874450e78936050cf26f93--
\r