You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2013/10/15 18:21:31 UTC
[1/2] git commit: updated refs/heads/master to 1cf4621
Updated Branches:
refs/heads/master 08f0009d4 -> 1cf46213e
Fix release version generation for docs.
The logic:
- If you didn't run ./bootstrap the version will be X.Y.Z-dev
- If you did: X.Y.Z+build.hash
- For CouchDB releases - just X.Y.Z (because we remove STAGE/RELEASE
info from acinclude.m4.in)
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/dd20a0fa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/dd20a0fa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/dd20a0fa
Branch: refs/heads/master
Commit: dd20a0fa69e85e985f70e65d6291416d529a2c34
Parents: 08f0009
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 15 19:18:08 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 15 19:18:08 2013 +0400
----------------------------------------------------------------------
share/doc/src/conf.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/dd20a0fa/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 0c649b8..3d2536e 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -24,10 +24,10 @@ _info = {}
_regex = re.compile('m4_define\(\[(.+)\],\s+\[(.+)\]\)')
_acinclude_m4 = '../../../acinclude.m4'
_acinclude_m4_in = '../../../acinclude.m4.in'
-if os.path.exists(_acinclude_m4_in):
- _source = _acinclude_m4_in
-elif os.path.exists(_acinclude_m4):
+if os.path.exists(_acinclude_m4):
_source = _acinclude_m4
+elif os.path.exists(_acinclude_m4_in):
+ _source = _acinclude_m4_in
else:
_source = None
if _source is not None:
@@ -50,11 +50,12 @@ release = '.'.join([
_info['LOCAL_VERSION_MAJOR'],
_info['LOCAL_VERSION_MINOR'],
_info['LOCAL_VERSION_REVISION']
-]) + (
- _info['LOCAL_VERSION_STAGE'] + '' + _info['LOCAL_VERSION_RELEASE']
- if _info.get('LOCAL_VERSION_RELEASE') == '%revision%'
- else '-dev'
-)
+])
+
+if _info.get('LOCAL_VERSION_RELEASE') == '.%revision%':
+ release += '-dev'
+elif _info.get('LOCAL_VERSION_RELEASE'):
+ release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
project = _info['LOCAL_PACKAGE_NAME']
[2/2] git commit: updated refs/heads/master to 1cf4621
Posted by kx...@apache.org.
Add missed docs files for `make html` output.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1cf46213
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1cf46213
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1cf46213
Branch: refs/heads/master
Commit: 1cf46213ea1cc204f459e2cb2d5a5d9bca161687
Parents: dd20a0f
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Oct 15 20:20:57 2013 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Oct 15 20:20:57 2013 +0400
----------------------------------------------------------------------
share/doc/build/Makefile.am | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1cf46213/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 30b933e..c4298d3 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -45,6 +45,26 @@ html_files = \
html/_images/futon-editeddoc.png \
html/_images/futon-overview.png \
html/_images/futon-replform.png \
+ html/_images/intro-consistency-01.png \
+ html/_images/intro-consistency-02.png \
+ html/_images/intro-consistency-03.png \
+ html/_images/intro-consistency-04.png \
+ html/_images/intro-consistency-05.png \
+ html/_images/intro-consistency-06.png \
+ html/_images/intro-consistency-07.png \
+ html/_images/intro-tour-01.png \
+ html/_images/intro-tour-02.png \
+ html/_images/intro-tour-03.png \
+ html/_images/intro-tour-04.png \
+ html/_images/intro-tour-05.png \
+ html/_images/intro-tour-06.png \
+ html/_images/intro-tour-07.png \
+ html/_images/intro-tour-08.png \
+ html/_images/intro-tour-09.png \
+ html/_images/intro-tour-10.png \
+ html/_images/intro-why-01.png \
+ html/_images/intro-why-02.png \
+ html/_images/intro-why-03.png \
html/_images/views-intro-01.png \
html/_images/views-intro-02.png \
html/_images/views-intro-03.png \
@@ -93,6 +113,7 @@ html_files = \
html/_sources/couchapp/views/intro.txt \
html/_sources/couchapp/views/joins.txt \
html/_sources/couchapp/views/nosql.txt \
+ html/_sources/couchapp/views/pagination.txt \
html/_sources/cve/2010-0009.txt \
html/_sources/cve/2010-2234.txt \
html/_sources/cve/2010-3854.txt \
@@ -264,11 +285,14 @@ html_files = \
html/about.html \
html/config-ref.html \
html/contents.html \
- html/externals.html \
+ html/contributing.html \
+ html/download.html \
html/experimental.html \
+ html/externals.html \
+ html/http-api.html \
+ html/index.html \
html/json-structure.html \
html/objects.inv \
- html/http-api.html \
html/search.html \
html/searchindex.js