Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 1FCE9431FC7 for ; Sat, 10 May 2014 10:04:26 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MJfhYOzS4GLt for ; Sat, 10 May 2014 10:04:18 -0700 (PDT) Received: from qmta04.westchester.pa.mail.comcast.net (qmta04.westchester.pa.mail.comcast.net [76.96.62.40]) by olra.theworths.org (Postfix) with ESMTP id D0770431FBF for ; Sat, 10 May 2014 10:04:17 -0700 (PDT) Received: from omta10.westchester.pa.mail.comcast.net ([76.96.62.28]) by qmta04.westchester.pa.mail.comcast.net with comcast id 0Gua1o0050cZkys54H4H66; Sat, 10 May 2014 17:04:17 +0000 Received: from odin.tremily.us ([24.18.63.50]) by omta10.westchester.pa.mail.comcast.net with comcast id 0H4F1o00Y152l3L3WH4Gqw; Sat, 10 May 2014 17:04:17 +0000 Received: from mjolnir.tremily.us (unknown [192.168.0.140]) by odin.tremily.us (Postfix) with ESMTPS id 9121411969A2; Sat, 10 May 2014 10:04:15 -0700 (PDT) Received: (nullmailer pid 24524 invoked by uid 1000); Sat, 10 May 2014 17:03:43 -0000 From: "W. Trevor King" To: notmuch@notmuchmail.org Subject: [PATCH v2 0/5] rst2man.py support and doc-build cleanups Date: Sat, 10 May 2014 10:03:31 -0700 Message-Id: X-Mailer: git-send-email 1.9.1.353.gc66d89d DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1399741457; bh=WRmUdTxirujjsEwA77yF6SuIPm1McVC5OSXlZqH6mFY=; h=Received:Received:Received:Received:From:To:Subject:Date: Message-Id; b=W7q5m7KF3fZQPKGgbV76uFLwnBTEGMp8vjaru7d7TYbQXYedLEILaKUeznuOjKzHt R3xHTUufCIcx+8yAVZMfTRRJndsPnFpvW/ZlnTyLAFJwcqvmGhnCV+nopAkzQS2cC1 hBccBFbZ/5JcZBPZFfIV4nvuUDcQ6ruhNE2LV5dfovUAVEts8/5ulSqu9P6XtSkFd+ FElYheLX3OI+01MN/m1ZH7nqWfiRi8KjaaV1pG+cFhCqYLHsnGLNccwkGqgYlIX34d 2Q2aPi/HV9ZWuvS+M3ttdgn1POqdGymclL0hkz1RCKClvHRWgHfRz2DelUnkBs0io2 mvpEi77bZlYGg== Cc: Tomi Ollila X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 17:04:26 -0000 The first four patches from v1 have already landed in master. This series is v2 of the remainder of the series [1]. In patch 1/5 (v1's 5/7): * Explicitly empty RST2MAN [2,3], rather than letting external environment variables fall through (or explicitly using them to bypass configure's detection code [4]). * Restore HAVE_RST2MAN instead of using non-empty RST2MAN [5]. I'm willing to go along with this (hence the patch), but I'd prefer dropping the HAVE_* variables. More details in the commit message for patch 5/5. In patch 4/5 (v1's 7/7): * Add a '.. -*- rst -*-' prefix to doc/INSTALL [6]. * Fix 'build build' -> 'build' [7]. * Fix 'Building the man Docutils' -> 'Building with Docutils' [7]. * Standardize on build-{html|info|man} and install-{info|man} [8]. * Add notes about the Sphinx/Docutils variables [7]. Patches 3/5 and 5/5 are new since v1, and add Sphinx-less support for build-html. [1]: id:cover.1396718720.git.wking@tremily.us http://article.gmane.org/gmane.mail.notmuch.general/17732 [2]: id:m2a9bzd2bo.fsf@guru.guru-group.fi http://article.gmane.org/gmane.mail.notmuch.general/17742 [3]: id:m21txac0qy.fsf@guru.guru-group.fi http://article.gmane.org/gmane.mail.notmuch.general/17775 [4]: id:20140405191917.GF5316@odin.tremily.us http://article.gmane.org/gmane.mail.notmuch.general/17745 [5]: id:m24n26c1m9.fsf@guru.guru-group.fi http://article.gmane.org/gmane.mail.notmuch.general/17774 [6]: id:87wqejtxs9.fsf@maritornes.cs.unb.ca http://article.gmane.org/gmane.mail.notmuch.general/17956 [7]: id:874n271plm.fsf@maritornes.cs.unb.ca http://article.gmane.org/gmane.mail.notmuch.general/17746 [8]: id:871txb1j8z.fsf@maritornes.cs.unb.ca http://article.gmane.org/gmane.mail.notmuch.general/17754 W. Trevor King (5): doc: Allow rst2man.py as an alternative to rst2man doc/prerst2man.py: Convert execfile to import doc/prerst2x.py: Adjust to handle any output format, not just man pages doc: Consolidate Makefile targets around {build|install}-{format} doc: Add rst2html support for building HTML docs Makefile.local | 14 ++++++++-- configure | 41 ++++++++++++++++++++++++++--- doc/INSTALL | 47 ++++++++++++++++++++++++---------- doc/Makefile.local | 48 +++++++++++++++++++--------------- doc/prerst2man.py | 63 --------------------------------------------- doc/prerst2x.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+), 102 deletions(-) delete mode 100644 doc/prerst2man.py create mode 100644 doc/prerst2x.py -- 1.9.1.353.gc66d89d