You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@couchdb.apache.org by Noah Slater <ns...@apache.org> on 2013/08/26 00:54:23 UTC
Re: git commit: updated refs/heads/1.4.x to afdf964
Hmm.
These values should ideally be written by configure. So this should be
conf.py.in, and conf.py gets created at build time.
I wonder why I never did it this way. Oh well. This is an easy one if
someone wants to bother.
On 23 August 2013 15:56, <dj...@apache.org> wrote:
> Updated Branches:
> refs/heads/1.4.x 06266f574 -> afdf9644f
>
>
> Update version in documentation.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/afdf9644
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afdf9644
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afdf9644
>
> Branch: refs/heads/1.4.x
> Commit: afdf9644fffbc8e52a6515f3fdea9c533e6a4d2e
> Parents: 06266f5
> Author: Dirkjan Ochtman <dj...@apache.org>
> Authored: Fri Aug 23 16:55:42 2013 +0200
> Committer: Dirkjan Ochtman <dj...@apache.org>
> Committed: Fri Aug 23 16:55:42 2013 +0200
>
> ----------------------------------------------------------------------
> share/doc/src/conf.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/afdf9644/share/doc/src/conf.py
> ----------------------------------------------------------------------
> diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
> index 6fd9112..8c352d6 100644
> --- a/share/doc/src/conf.py
> +++ b/share/doc/src/conf.py
> @@ -20,9 +20,9 @@ master_doc = "index"
>
> nitpicky = True
>
> -version = "1.3"
> +version = "1.4"
>
> -release = "1.3.0"
> +release = "1.4.0"
>
> project = u"Apache CouchDB"
>
>
>
--
Noah Slater
https://twitter.com/nslater
Re: git commit: updated refs/heads/1.4.x to afdf964
Posted by Noah Slater <ns...@apache.org>.
The other approach is to do nothing, of course. :)
When are we gonna replace Autotools? Soon, I hope. The existing setup
works, it's just manual. No urgency to this.
Side note (for Benoit or anyone else familiar with this stuff): how is this
sort of thing handled with rebar?
On 26 August 2013 18:13, Alexander Shorin <kx...@gmail.com> wrote:
> Not much. At least I don't have to bootstap/configure things to work on
> docs (:
> But you're right since we are (still) using autotools to configure
> things - there should be the only way how things are working. I'm just
> a Python guy and this way is simpler for me. Need to play with
> autotools for some time.
>
> --
> ,,,^..^,,,
>
>
> On Mon, Aug 26, 2013 at 8:59 PM, Noah Slater <ns...@apache.org> wrote:
> > Hehe. Too complex. Let's just use the Autotools machinery how it was
> > intended. :)
> >
> > There are plenty of examples in the source.
> >
> > Here's couchdb.conf.in:
> >
> >
> https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=blob_plain;f=bin/couchdb.tpl.in;hb=HEAD
> >
> > Then, in configure.ac, you have this line:
> >
> > AC_CONFIG_FILES([bin/couchdb.tpl])
> >
> > So, during the `./configure` invocation, the .in file gets processed and
> > renamed.
> >
> > You define variables with %percent_signs% like this:
> >
> > DEFAULT_CONFIG_DIR=%localconfdir%/default.d
> >
> > Here 'localconfdir' is defined in configure.ac.
> >
> >
> > On 26 August 2013 04:57, Alexander Shorin <kx...@gmail.com> wrote:
> >
> >> I have a bit better solution:
> >>
> >> https://www.friendpaste.com/3vzULs97Fl0AaPXqG6NuTZ
> >>
> >> What do you think?
> >> --
> >> ,,,^..^,,,
> >>
> >>
> >> On Mon, Aug 26, 2013 at 2:54 AM, Noah Slater <ns...@apache.org>
> wrote:
> >> > Hmm.
> >> >
> >> > These values should ideally be written by configure. So this should be
> >> > conf.py.in, and conf.py gets created at build time.
> >> >
> >> > I wonder why I never did it this way. Oh well. This is an easy one if
> >> > someone wants to bother.
> >> >
> >> >
> >> > On 23 August 2013 15:56, <dj...@apache.org> wrote:
> >> >
> >> >> Updated Branches:
> >> >> refs/heads/1.4.x 06266f574 -> afdf9644f
> >> >>
> >> >>
> >> >> Update version in documentation.
> >> >>
> >> >>
> >> >> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> >> >> Commit:
> http://git-wip-us.apache.org/repos/asf/couchdb/commit/afdf9644
> >> >> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afdf9644
> >> >> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afdf9644
> >> >>
> >> >> Branch: refs/heads/1.4.x
> >> >> Commit: afdf9644fffbc8e52a6515f3fdea9c533e6a4d2e
> >> >> Parents: 06266f5
> >> >> Author: Dirkjan Ochtman <dj...@apache.org>
> >> >> Authored: Fri Aug 23 16:55:42 2013 +0200
> >> >> Committer: Dirkjan Ochtman <dj...@apache.org>
> >> >> Committed: Fri Aug 23 16:55:42 2013 +0200
> >> >>
> >> >>
> ----------------------------------------------------------------------
> >> >> share/doc/src/conf.py | 4 ++--
> >> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >> >>
> ----------------------------------------------------------------------
> >> >>
> >> >>
> >> >>
> >> >>
> >>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/afdf9644/share/doc/src/conf.py
> >> >>
> ----------------------------------------------------------------------
> >> >> diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
> >> >> index 6fd9112..8c352d6 100644
> >> >> --- a/share/doc/src/conf.py
> >> >> +++ b/share/doc/src/conf.py
> >> >> @@ -20,9 +20,9 @@ master_doc = "index"
> >> >>
> >> >> nitpicky = True
> >> >>
> >> >> -version = "1.3"
> >> >> +version = "1.4"
> >> >>
> >> >> -release = "1.3.0"
> >> >> +release = "1.4.0"
> >> >>
> >> >> project = u"Apache CouchDB"
> >> >>
> >> >>
> >> >>
> >> >
> >> >
> >> > --
> >> > Noah Slater
> >> > https://twitter.com/nslater
> >>
> >
> >
> >
> > --
> > Noah Slater
> > https://twitter.com/nslater
>
--
Noah Slater
https://twitter.com/nslater
Re: git commit: updated refs/heads/1.4.x to afdf964
Posted by Alexander Shorin <kx...@gmail.com>.
Not much. At least I don't have to bootstap/configure things to work on docs (:
But you're right since we are (still) using autotools to configure
things - there should be the only way how things are working. I'm just
a Python guy and this way is simpler for me. Need to play with
autotools for some time.
--
,,,^..^,,,
On Mon, Aug 26, 2013 at 8:59 PM, Noah Slater <ns...@apache.org> wrote:
> Hehe. Too complex. Let's just use the Autotools machinery how it was
> intended. :)
>
> There are plenty of examples in the source.
>
> Here's couchdb.conf.in:
>
> https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=blob_plain;f=bin/couchdb.tpl.in;hb=HEAD
>
> Then, in configure.ac, you have this line:
>
> AC_CONFIG_FILES([bin/couchdb.tpl])
>
> So, during the `./configure` invocation, the .in file gets processed and
> renamed.
>
> You define variables with %percent_signs% like this:
>
> DEFAULT_CONFIG_DIR=%localconfdir%/default.d
>
> Here 'localconfdir' is defined in configure.ac.
>
>
> On 26 August 2013 04:57, Alexander Shorin <kx...@gmail.com> wrote:
>
>> I have a bit better solution:
>>
>> https://www.friendpaste.com/3vzULs97Fl0AaPXqG6NuTZ
>>
>> What do you think?
>> --
>> ,,,^..^,,,
>>
>>
>> On Mon, Aug 26, 2013 at 2:54 AM, Noah Slater <ns...@apache.org> wrote:
>> > Hmm.
>> >
>> > These values should ideally be written by configure. So this should be
>> > conf.py.in, and conf.py gets created at build time.
>> >
>> > I wonder why I never did it this way. Oh well. This is an easy one if
>> > someone wants to bother.
>> >
>> >
>> > On 23 August 2013 15:56, <dj...@apache.org> wrote:
>> >
>> >> Updated Branches:
>> >> refs/heads/1.4.x 06266f574 -> afdf9644f
>> >>
>> >>
>> >> Update version in documentation.
>> >>
>> >>
>> >> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>> >> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/afdf9644
>> >> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afdf9644
>> >> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afdf9644
>> >>
>> >> Branch: refs/heads/1.4.x
>> >> Commit: afdf9644fffbc8e52a6515f3fdea9c533e6a4d2e
>> >> Parents: 06266f5
>> >> Author: Dirkjan Ochtman <dj...@apache.org>
>> >> Authored: Fri Aug 23 16:55:42 2013 +0200
>> >> Committer: Dirkjan Ochtman <dj...@apache.org>
>> >> Committed: Fri Aug 23 16:55:42 2013 +0200
>> >>
>> >> ----------------------------------------------------------------------
>> >> share/doc/src/conf.py | 4 ++--
>> >> 1 file changed, 2 insertions(+), 2 deletions(-)
>> >> ----------------------------------------------------------------------
>> >>
>> >>
>> >>
>> >>
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/afdf9644/share/doc/src/conf.py
>> >> ----------------------------------------------------------------------
>> >> diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
>> >> index 6fd9112..8c352d6 100644
>> >> --- a/share/doc/src/conf.py
>> >> +++ b/share/doc/src/conf.py
>> >> @@ -20,9 +20,9 @@ master_doc = "index"
>> >>
>> >> nitpicky = True
>> >>
>> >> -version = "1.3"
>> >> +version = "1.4"
>> >>
>> >> -release = "1.3.0"
>> >> +release = "1.4.0"
>> >>
>> >> project = u"Apache CouchDB"
>> >>
>> >>
>> >>
>> >
>> >
>> > --
>> > Noah Slater
>> > https://twitter.com/nslater
>>
>
>
>
> --
> Noah Slater
> https://twitter.com/nslater
Re: git commit: updated refs/heads/1.4.x to afdf964
Posted by Noah Slater <ns...@apache.org>.
Hehe. Too complex. Let's just use the Autotools machinery how it was
intended. :)
There are plenty of examples in the source.
Here's couchdb.conf.in:
https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=blob_plain;f=bin/couchdb.tpl.in;hb=HEAD
Then, in configure.ac, you have this line:
AC_CONFIG_FILES([bin/couchdb.tpl])
So, during the `./configure` invocation, the .in file gets processed and
renamed.
You define variables with %percent_signs% like this:
DEFAULT_CONFIG_DIR=%localconfdir%/default.d
Here 'localconfdir' is defined in configure.ac.
On 26 August 2013 04:57, Alexander Shorin <kx...@gmail.com> wrote:
> I have a bit better solution:
>
> https://www.friendpaste.com/3vzULs97Fl0AaPXqG6NuTZ
>
> What do you think?
> --
> ,,,^..^,,,
>
>
> On Mon, Aug 26, 2013 at 2:54 AM, Noah Slater <ns...@apache.org> wrote:
> > Hmm.
> >
> > These values should ideally be written by configure. So this should be
> > conf.py.in, and conf.py gets created at build time.
> >
> > I wonder why I never did it this way. Oh well. This is an easy one if
> > someone wants to bother.
> >
> >
> > On 23 August 2013 15:56, <dj...@apache.org> wrote:
> >
> >> Updated Branches:
> >> refs/heads/1.4.x 06266f574 -> afdf9644f
> >>
> >>
> >> Update version in documentation.
> >>
> >>
> >> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
> >> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/afdf9644
> >> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afdf9644
> >> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afdf9644
> >>
> >> Branch: refs/heads/1.4.x
> >> Commit: afdf9644fffbc8e52a6515f3fdea9c533e6a4d2e
> >> Parents: 06266f5
> >> Author: Dirkjan Ochtman <dj...@apache.org>
> >> Authored: Fri Aug 23 16:55:42 2013 +0200
> >> Committer: Dirkjan Ochtman <dj...@apache.org>
> >> Committed: Fri Aug 23 16:55:42 2013 +0200
> >>
> >> ----------------------------------------------------------------------
> >> share/doc/src/conf.py | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >> ----------------------------------------------------------------------
> >>
> >>
> >>
> >>
> http://git-wip-us.apache.org/repos/asf/couchdb/blob/afdf9644/share/doc/src/conf.py
> >> ----------------------------------------------------------------------
> >> diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
> >> index 6fd9112..8c352d6 100644
> >> --- a/share/doc/src/conf.py
> >> +++ b/share/doc/src/conf.py
> >> @@ -20,9 +20,9 @@ master_doc = "index"
> >>
> >> nitpicky = True
> >>
> >> -version = "1.3"
> >> +version = "1.4"
> >>
> >> -release = "1.3.0"
> >> +release = "1.4.0"
> >>
> >> project = u"Apache CouchDB"
> >>
> >>
> >>
> >
> >
> > --
> > Noah Slater
> > https://twitter.com/nslater
>
--
Noah Slater
https://twitter.com/nslater
Re: git commit: updated refs/heads/1.4.x to afdf964
Posted by Alexander Shorin <kx...@gmail.com>.
I have a bit better solution:
https://www.friendpaste.com/3vzULs97Fl0AaPXqG6NuTZ
What do you think?
--
,,,^..^,,,
On Mon, Aug 26, 2013 at 2:54 AM, Noah Slater <ns...@apache.org> wrote:
> Hmm.
>
> These values should ideally be written by configure. So this should be
> conf.py.in, and conf.py gets created at build time.
>
> I wonder why I never did it this way. Oh well. This is an easy one if
> someone wants to bother.
>
>
> On 23 August 2013 15:56, <dj...@apache.org> wrote:
>
>> Updated Branches:
>> refs/heads/1.4.x 06266f574 -> afdf9644f
>>
>>
>> Update version in documentation.
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/afdf9644
>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afdf9644
>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afdf9644
>>
>> Branch: refs/heads/1.4.x
>> Commit: afdf9644fffbc8e52a6515f3fdea9c533e6a4d2e
>> Parents: 06266f5
>> Author: Dirkjan Ochtman <dj...@apache.org>
>> Authored: Fri Aug 23 16:55:42 2013 +0200
>> Committer: Dirkjan Ochtman <dj...@apache.org>
>> Committed: Fri Aug 23 16:55:42 2013 +0200
>>
>> ----------------------------------------------------------------------
>> share/doc/src/conf.py | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/afdf9644/share/doc/src/conf.py
>> ----------------------------------------------------------------------
>> diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
>> index 6fd9112..8c352d6 100644
>> --- a/share/doc/src/conf.py
>> +++ b/share/doc/src/conf.py
>> @@ -20,9 +20,9 @@ master_doc = "index"
>>
>> nitpicky = True
>>
>> -version = "1.3"
>> +version = "1.4"
>>
>> -release = "1.3.0"
>> +release = "1.4.0"
>>
>> project = u"Apache CouchDB"
>>
>>
>>
>
>
> --
> Noah Slater
> https://twitter.com/nslater