From 708f0a119e507a2ab524817b787f03885e7306b2 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 9 Jul 2014 23:22:49 +0300 Subject: [PATCH] Re: [Patch v4 1/3] doc: build and install doxygen api docs --- dd/d2b5455a496f72b5f6f8ed6a428e7da3571068 | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 dd/d2b5455a496f72b5f6f8ed6a428e7da3571068 diff --git a/dd/d2b5455a496f72b5f6f8ed6a428e7da3571068 b/dd/d2b5455a496f72b5f6f8ed6a428e7da3571068 new file mode 100644 index 000000000..e92718a37 --- /dev/null +++ b/dd/d2b5455a496f72b5f6f8ed6a428e7da3571068 @@ -0,0 +1,94 @@ +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 74240431FB6 + for ; Wed, 9 Jul 2014 13:23:05 -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=[none] + 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 MBDlJnezTmic for ; + Wed, 9 Jul 2014 13:22:58 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 78B17431FAF + for ; Wed, 9 Jul 2014 13:22:58 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 7FFE410008F; + Wed, 9 Jul 2014 23:22:49 +0300 (EEST) +From: Tomi Ollila +To: David Bremner , notmuch@notmuchmail.org +Subject: Re: [Patch v4 1/3] doc: build and install doxygen api docs +In-Reply-To: <1404863829-3343-2-git-send-email-david@tethera.net> +References: <1404657994-30628-4-git-send-email-david@tethera.net> + <1404863829-3343-1-git-send-email-david@tethera.net> + <1404863829-3343-2-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.18.1+25~gdaf4b6f (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Wed, 09 Jul 2014 20:23:05 -0000 + +On Wed, Jul 09 2014, David Bremner wrote: + +> In order to support out of tree builds, generate `doc/config.dox` from +> configure. +> +> In order to avoid hardcoding version in doxygen.cfg, generate +> doc/version.dox at build time. + +is this commit message accurate ? + +> --- +> configure | 12 ++++++++++++ +> doc/Makefile.local | 27 +++++++++++++++++++++++++-- +> doc/doxygen.cfg | 5 ++--- +> 3 files changed, 39 insertions(+), 5 deletions(-) +> +> diff --git a/configure b/configure +> index 9514d4d..fa44188 100755 +> --- a/configure +> +++ b/configure +> @@ -417,6 +417,15 @@ else +> have_emacs=0 +> fi +> +> +printf "Checking if doxygen is available... " +> +if doxygen -v > /dev/null 2>&1; then + +Doxygen 1.6.1 does not know -v -- and exits w/ value 1. If we wanted to +allow man generation using that version (out-of-the-box) then the line +above should be `if command -v doxygen >/dev/null; then` + +otherwise this series looks good and generation seems to work. + +Tomi + +> + printf "Yes.\n" +> + have_doxygen=1 +> +else +> + printf "No (so will not install api docs)\n" +> + have_doxygen=0 +> +fi +> + -- 2.26.2