* [PATCH] configure: add --without-docs switch
@ 2015-07-25 18:57 mp39590
2015-07-26 15:46 ` David Bremner
0 siblings, 1 reply; 8+ messages in thread
From: mp39590 @ 2015-07-25 18:57 UTC (permalink / raw)
To: notmuch
From: Mikhail <mp39590@gmail.com>
Previously documentation was build automatically if sphinx/doxygen
executable were found. The switch is used to unconditionally disable
sphinx/doxygen detection and therefor, building of documentation
(including man pages).
---
configure | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git configure configure
index b967a4e..c07a49b 100755
--- configure
+++ configure
@@ -65,6 +65,7 @@ PYTHON=${PYTHON:-}
# options.
PREFIX=/usr/local
LIBDIR=
+WITH_DOCS=1
WITH_EMACS=1
WITH_BASH=1
WITH_ZSH=1
@@ -143,6 +144,7 @@ Some specific library versions can be specified (auto-detected otherwise):
Some features can be disabled (--with-feature=no is equivalent to
--without-feature) :
+ --without-docs Do not install documentation and man pages
--without-emacs Do not install lisp file
--without-bash-completion Do not install bash completions files
--without-zsh-completion Do not install zsh completions files
@@ -185,6 +187,8 @@ for option; do
BASHCOMPLETIONDIR="${option#*=}"
elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
ZSHCOMLETIONDIR="${option#*=}"
+ elif [ "${option}" = '--without-docs' ] ; then
+ WITH_DOCS=0
elif [ "${option%%=*}" = '--with-emacs' ]; then
if [ "${option#*=}" = 'no' ]; then
WITH_EMACS=0
@@ -466,13 +470,15 @@ else
have_emacs=0
fi
-printf "Checking if doxygen is available... "
-if command -v doxygen > /dev/null; then
- printf "Yes.\n"
- have_doxygen=1
-else
- printf "No (so will not install api docs)\n"
- have_doxygen=0
+have_doxygen=0
+if [ $WITH_DOCS = "1" ] ; then
+ printf "Checking if doxygen is available... "
+ if command -v doxygen > /dev/null; then
+ printf "Yes.\n"
+ have_doxygen=1
+ else
+ printf "No (so will not install api docs)\n"
+ fi
fi
printf "Checking for ruby development files... "
@@ -484,13 +490,15 @@ else
have_ruby_dev=0
fi
-printf "Checking if sphinx is available and supports nroff output... "
-if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
- printf "Yes.\n"
- have_sphinx=1
-else
- printf "No (so will not install man pages).\n"
- have_sphinx=0
+have_sphinx=0
+if [ $WITH_DOCS = "1" ] ; then
+ printf "Checking if sphinx is available and supports nroff output... "
+ if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
+ printf "Yes.\n"
+ have_sphinx=1
+ else
+ printf "No (so will not install man pages).\n"
+ fi
fi
libdir_in_ldconfig=0
--
2.4.6
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] configure: add --without-docs switch
2015-07-25 18:57 [PATCH] configure: add --without-docs switch mp39590
@ 2015-07-26 15:46 ` David Bremner
2015-07-27 18:04 ` mp39590
0 siblings, 1 reply; 8+ messages in thread
From: David Bremner @ 2015-07-26 15:46 UTC (permalink / raw)
To: mp39590, notmuch
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
For some reason I can't apply this patch with git 2.1.4. I think I had
the same problem with your last patch but it was only one line.
Does it round trip for you? i.e. can you apply the patches you send?
I get
Applying: configure: add --without-docs switch
fatal: git diff header lacks filename information when removing 1 leading pathname component (line 9)
Patch failed at 0001 configure: add --without-docs switch
I have attached the "extracted" patch, in case it helps someone debug
this.
[-- Attachment #2: patch --]
[-- Type: application/octet-stream, Size: 2543 bytes --]
---
configure | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git configure configure
index b967a4e..c07a49b 100755
--- configure
+++ configure
@@ -65,6 +65,7 @@ PYTHON=${PYTHON:-}
# options.
PREFIX=/usr/local
LIBDIR=
+WITH_DOCS=1
WITH_EMACS=1
WITH_BASH=1
WITH_ZSH=1
@@ -143,6 +144,7 @@ Some specific library versions can be specified (auto-detected otherwise):
Some features can be disabled (--with-feature=no is equivalent to
--without-feature) :
+ --without-docs Do not install documentation and man pages
--without-emacs Do not install lisp file
--without-bash-completion Do not install bash completions files
--without-zsh-completion Do not install zsh completions files
@@ -185,6 +187,8 @@ for option; do
BASHCOMPLETIONDIR="${option#*=}"
elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
ZSHCOMLETIONDIR="${option#*=}"
+ elif [ "${option}" = '--without-docs' ] ; then
+ WITH_DOCS=0
elif [ "${option%%=*}" = '--with-emacs' ]; then
if [ "${option#*=}" = 'no' ]; then
WITH_EMACS=0
@@ -466,13 +470,15 @@ else
have_emacs=0
fi
-printf "Checking if doxygen is available... "
-if command -v doxygen > /dev/null; then
- printf "Yes.\n"
- have_doxygen=1
-else
- printf "No (so will not install api docs)\n"
- have_doxygen=0
+have_doxygen=0
+if [ $WITH_DOCS = "1" ] ; then
+ printf "Checking if doxygen is available... "
+ if command -v doxygen > /dev/null; then
+ printf "Yes.\n"
+ have_doxygen=1
+ else
+ printf "No (so will not install api docs)\n"
+ fi
fi
printf "Checking for ruby development files... "
@@ -484,13 +490,15 @@ else
have_ruby_dev=0
fi
-printf "Checking if sphinx is available and supports nroff output... "
-if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
- printf "Yes.\n"
- have_sphinx=1
-else
- printf "No (so will not install man pages).\n"
- have_sphinx=0
+have_sphinx=0
+if [ $WITH_DOCS = "1" ] ; then
+ printf "Checking if sphinx is available and supports nroff output... "
+ if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
+ printf "Yes.\n"
+ have_sphinx=1
+ else
+ printf "No (so will not install man pages).\n"
+ fi
fi
libdir_in_ldconfig=0
--
2.4.6
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] configure: add --without-docs switch
2015-07-26 15:46 ` David Bremner
@ 2015-07-27 18:04 ` mp39590
2015-07-27 20:42 ` David Bremner
2015-07-28 18:11 ` David Bremner
0 siblings, 2 replies; 8+ messages in thread
From: mp39590 @ 2015-07-27 18:04 UTC (permalink / raw)
To: notmuch
From: Mikhail <mp39590@gmail.com>
Previously documentation was build automatically if sphinx/doxygen
executable were found. The switch is used to unconditionally disable
sphinx/doxygen detection and therefor, building of documentation
(including man pages).
---
The issue was about setting "noprefix = true" in .gitconfig.
Please try this patch.
configure | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/configure b/configure
index b967a4e..c07a49b 100755
--- a/configure
+++ b/configure
@@ -65,6 +65,7 @@ PYTHON=${PYTHON:-}
# options.
PREFIX=/usr/local
LIBDIR=
+WITH_DOCS=1
WITH_EMACS=1
WITH_BASH=1
WITH_ZSH=1
@@ -143,6 +144,7 @@ Some specific library versions can be specified (auto-detected otherwise):
Some features can be disabled (--with-feature=no is equivalent to
--without-feature) :
+ --without-docs Do not install documentation and man pages
--without-emacs Do not install lisp file
--without-bash-completion Do not install bash completions files
--without-zsh-completion Do not install zsh completions files
@@ -185,6 +187,8 @@ for option; do
BASHCOMPLETIONDIR="${option#*=}"
elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
ZSHCOMLETIONDIR="${option#*=}"
+ elif [ "${option}" = '--without-docs' ] ; then
+ WITH_DOCS=0
elif [ "${option%%=*}" = '--with-emacs' ]; then
if [ "${option#*=}" = 'no' ]; then
WITH_EMACS=0
@@ -466,13 +470,15 @@ else
have_emacs=0
fi
-printf "Checking if doxygen is available... "
-if command -v doxygen > /dev/null; then
- printf "Yes.\n"
- have_doxygen=1
-else
- printf "No (so will not install api docs)\n"
- have_doxygen=0
+have_doxygen=0
+if [ $WITH_DOCS = "1" ] ; then
+ printf "Checking if doxygen is available... "
+ if command -v doxygen > /dev/null; then
+ printf "Yes.\n"
+ have_doxygen=1
+ else
+ printf "No (so will not install api docs)\n"
+ fi
fi
printf "Checking for ruby development files... "
@@ -484,13 +490,15 @@ else
have_ruby_dev=0
fi
-printf "Checking if sphinx is available and supports nroff output... "
-if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
- printf "Yes.\n"
- have_sphinx=1
-else
- printf "No (so will not install man pages).\n"
- have_sphinx=0
+have_sphinx=0
+if [ $WITH_DOCS = "1" ] ; then
+ printf "Checking if sphinx is available and supports nroff output... "
+ if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
+ printf "Yes.\n"
+ have_sphinx=1
+ else
+ printf "No (so will not install man pages).\n"
+ fi
fi
libdir_in_ldconfig=0
--
2.4.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] configure: add --without-docs switch
2015-07-27 18:04 ` mp39590
@ 2015-07-27 20:42 ` David Bremner
2015-07-28 6:51 ` Tomi Ollila
2015-07-28 18:11 ` David Bremner
1 sibling, 1 reply; 8+ messages in thread
From: David Bremner @ 2015-07-27 20:42 UTC (permalink / raw)
To: mp39590, notmuch
mp39590@gmail.com writes:
> From: Mikhail <mp39590@gmail.com>
>
> Previously documentation was build automatically if sphinx/doxygen
> executable were found. The switch is used to unconditionally disable
> sphinx/doxygen detection and therefor, building of documentation
> (including man pages).
> ---
>
> The issue was about setting "noprefix = true" in .gitconfig.
> Please try this patch.
This version seems OK for me. Any objects from others?
d
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] configure: add --without-docs switch
2015-07-27 20:42 ` David Bremner
@ 2015-07-28 6:51 ` Tomi Ollila
2015-07-28 9:06 ` David Bremner
0 siblings, 1 reply; 8+ messages in thread
From: Tomi Ollila @ 2015-07-28 6:51 UTC (permalink / raw)
To: David Bremner, mp39590, notmuch
On Mon, Jul 27 2015, David Bremner <david@tethera.net> wrote:
> mp39590@gmail.com writes:
>
>> From: Mikhail <mp39590@gmail.com>
>>
>> Previously documentation was build automatically if sphinx/doxygen
>> executable were found. The switch is used to unconditionally disable
>> sphinx/doxygen detection and therefor, building of documentation
>> (including man pages).
>> ---
>>
>> The issue was about setting "noprefix = true" in .gitconfig.
>> Please try this patch.
>
> This version seems OK for me. Any objects from others?
Do I sound like a nitpicker when I mention that the new indentations
uses spaces instead of tabs... ;) ? ... perhaps I do since there are 2
other places w/ space indentation (CPPFLAGS & xapian compact)
(otherwise) LGTM
Tomi
>
> d
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] configure: add --without-docs switch
2015-07-28 6:51 ` Tomi Ollila
@ 2015-07-28 9:06 ` David Bremner
2015-07-28 11:59 ` Tomi Ollila
0 siblings, 1 reply; 8+ messages in thread
From: David Bremner @ 2015-07-28 9:06 UTC (permalink / raw)
To: Tomi Ollila, mp39590, notmuch
Tomi Ollila <tomi.ollila@iki.fi> writes:
> On Mon, Jul 27 2015, David Bremner <david@tethera.net> wrote:
>
>> mp39590@gmail.com writes:
>>
>>> From: Mikhail <mp39590@gmail.com>
>>>
>>> Previously documentation was build automatically if sphinx/doxygen
>>> executable were found. The switch is used to unconditionally disable
>>> sphinx/doxygen detection and therefor, building of documentation
>>> (including man pages).
>>> ---
>>>
>>> The issue was about setting "noprefix = true" in .gitconfig.
>>> Please try this patch.
>>
>> This version seems OK for me. Any objects from others?
>
> Do I sound like a nitpicker when I mention that the new indentations
> uses spaces instead of tabs... ;) ? ... perhaps I do since there are 2
> other places w/ space indentation (CPPFLAGS & xapian compact)
>
I could make a followup commit with "M-x whitespace-cleanup" in emacs,
how does that sound?
d
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] configure: add --without-docs switch
2015-07-28 9:06 ` David Bremner
@ 2015-07-28 11:59 ` Tomi Ollila
0 siblings, 0 replies; 8+ messages in thread
From: Tomi Ollila @ 2015-07-28 11:59 UTC (permalink / raw)
To: David Bremner, mp39590, notmuch
On Tue, Jul 28 2015, David Bremner <david@tethera.net> wrote:
> Tomi Ollila <tomi.ollila@iki.fi> writes:
>
>> On Mon, Jul 27 2015, David Bremner <david@tethera.net> wrote:
>>
>>> mp39590@gmail.com writes:
>>>
>>>> From: Mikhail <mp39590@gmail.com>
>>>>
>>>> Previously documentation was build automatically if sphinx/doxygen
>>>> executable were found. The switch is used to unconditionally disable
>>>> sphinx/doxygen detection and therefor, building of documentation
>>>> (including man pages).
>>>> ---
>>>>
>>>> The issue was about setting "noprefix = true" in .gitconfig.
>>>> Please try this patch.
>>>
>>> This version seems OK for me. Any objects from others?
>>
>> Do I sound like a nitpicker when I mention that the new indentations
>> uses spaces instead of tabs... ;) ? ... perhaps I do since there are 2
>> other places w/ space indentation (CPPFLAGS & xapian compact)
>>
>
> I could make a followup commit with "M-x whitespace-cleanup" in emacs,
> how does that sound?
fine by me.
>
> d
Tomi
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] configure: add --without-docs switch
2015-07-27 18:04 ` mp39590
2015-07-27 20:42 ` David Bremner
@ 2015-07-28 18:11 ` David Bremner
1 sibling, 0 replies; 8+ messages in thread
From: David Bremner @ 2015-07-28 18:11 UTC (permalink / raw)
To: mp39590, notmuch
mp39590@gmail.com writes:
> From: Mikhail <mp39590@gmail.com>
>
> Previously documentation was build automatically if sphinx/doxygen
> executable were found. The switch is used to unconditionally disable
> sphinx/doxygen detection and therefor, building of documentation
> (including man pages).
I pushed this patch, along with some whitespace cleanup.
It exposes one of our tests as broken (one of the subtests of
T010-help); I verified that it was equally broken on systems without
sphinx.
d
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-07-28 18:13 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-25 18:57 [PATCH] configure: add --without-docs switch mp39590
2015-07-26 15:46 ` David Bremner
2015-07-27 18:04 ` mp39590
2015-07-27 20:42 ` David Bremner
2015-07-28 6:51 ` Tomi Ollila
2015-07-28 9:06 ` David Bremner
2015-07-28 11:59 ` Tomi Ollila
2015-07-28 18:11 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).