[PATCH] configure: add --without-docs switch

[David Bremner]

mp39590 at gmail.com writes:

> From: Mikhail 
>
> 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

[PATCH] configure: add --without-docs switch

[Tomi Ollila]

On Tue, Jul 28 2015, David Bremner  wrote:

> Tomi Ollila  writes:
>
>> On Mon, Jul 27 2015, David Bremner  wrote:
>>
>>> mp39590 at gmail.com writes:
>>>
 From: Mikhail 

 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

[PATCH] configure: add --without-docs switch

[David Bremner]

Tomi Ollila  writes:

> On Mon, Jul 27 2015, David Bremner  wrote:
>
>> mp39590 at gmail.com writes:
>>
>>> From: Mikhail 
>>>
>>> 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

[PATCH] configure: add --without-docs switch

[Tomi Ollila]

On Mon, Jul 27 2015, David Bremner  wrote:

> mp39590 at gmail.com writes:
>
>> From: Mikhail 
>>
>> 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

Re: [PATCH] configure: add --without-docs switch

[Tomi Ollila]

On Mon, Jul 27 2015, David Bremner da...@tethera.net wrote:

 mp39...@gmail.com writes:

 From: Mikhail mp39...@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
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] configure: add --without-docs switch

[Tomi Ollila]

On Tue, Jul 28 2015, David Bremner da...@tethera.net wrote:

 Tomi Ollila tomi.oll...@iki.fi writes:

 On Mon, Jul 27 2015, David Bremner da...@tethera.net wrote:

 mp39...@gmail.com writes:

 From: Mikhail mp39...@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
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] configure: add --without-docs switch

[David Bremner]

Tomi Ollila tomi.oll...@iki.fi writes:

 On Mon, Jul 27 2015, David Bremner da...@tethera.net wrote:

 mp39...@gmail.com writes:

 From: Mikhail mp39...@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
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH] configure: add --without-docs switch

[David Bremner]

mp39...@gmail.com writes:

 From: Mikhail mp39...@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
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH] configure: add --without-docs switch

[David Bremner]

mp39590 at gmail.com writes:

> From: Mikhail 
>
> 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

[PATCH] configure: add --without-docs switch

[mp39...@gmail.com]

From: Mikhail 

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-completionDo 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

[PATCH] configure: add --without-docs switch

[mp39590]

From: Mikhail mp39...@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-completionDo 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 21 ; 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 21 ; 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

Re: [PATCH] configure: add --without-docs switch

[David Bremner]

mp39...@gmail.com writes:

 From: Mikhail mp39...@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
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH] configure: add --without-docs switch

[David Bremner]

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.

-- next part --
A non-text attachment was scrubbed...
Name: patch
Type: application/octet-stream
Size: 2543 bytes
Desc: not available
URL: 

Re: [PATCH] configure: add --without-docs switch

[David Bremner]

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.



patch
Description: Binary data
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch

[PATCH] configure: add --without-docs switch

[mp39590]

From: Mikhail mp39...@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-completionDo 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 21 ; 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 21 ; 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

[PATCH] configure: add --without-docs switch

[mp39...@gmail.com]

From: Mikhail 

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-completionDo 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