You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2013/12/19 17:38:37 UTC
git commit: updated refs/heads/2007-fix-docs-under-ci to bb326ef
Updated Branches:
refs/heads/2007-fix-docs-under-ci [created] bb326eff5
Docs: Fix doc building under CI
Under CI the CouchDB version configured can break the LaTeX PDF
building.
This patch munges the release name for doc builds.
Closes COUCHDB-2007
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bb326eff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bb326eff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bb326eff
Branch: refs/heads/2007-fix-docs-under-ci
Commit: bb326eff54d799f8b684a024891f301ebb5cf585
Parents: d5f0976
Author: Jan Lehnardt <ja...@apache.org>
Authored: Thu Dec 19 17:37:22 2013 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Thu Dec 19 17:37:22 2013 +0100
----------------------------------------------------------------------
share/doc/src/conf.py | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb326eff/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 3d2536e..c379bc5 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -57,6 +57,20 @@ if _info.get('LOCAL_VERSION_RELEASE') == '.%revision%':
elif _info.get('LOCAL_VERSION_RELEASE'):
release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE']
+# jenkins hack, the release name is too long or uses
+# characters that cause pain down the road. Example:
+# 1.6.0+build.jenkins-ERLANG_VERSION=R14B04,label=Mac-OS-10-8-2-832-76-g2996574
+# which breaks the LaTeX PDF build. Let’s strip this
+# down to the git hash at the end.
+
+if release.find('jenkins') > 0:
+ commit_hash = release[-9:-1]
+ release = '.'.join([
+ _info['LOCAL_VERSION_MAJOR'],
+ _info['LOCAL_VERSION_MINOR'],
+ _info['LOCAL_VERSION_REVISION']])
+ release += commit_hash
+
project = _info['LOCAL_PACKAGE_NAME']
copyright = '%d, %s' % (