couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 1cf4621
Date Tue, 15 Oct 2013 16:21:31 GMT
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 <kxepal@apache.org>
Authored: Tue Oct 15 19:18:08 2013 +0400
Committer: Alexander Shorin <kxepal@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']
 


Mime
View raw message