null+****@clear*****
null+****@clear*****
2012年 5月 30日 (水) 10:23:17 JST
Kouhei Sutou 2012-05-30 10:23:17 +0900 (Wed, 30 May 2012)
New Revision: b4b05aad7d681a3d1a59113e28f537aba35c8fb9
Log:
doc: use DOCUMENT_VERSION* to pass version information to Sphinx
Modified files:
build/makefiles/sphinx-build.am
doc/source/conf.py
Modified: build/makefiles/sphinx-build.am (+2 -2)
===================================================================
--- build/makefiles/sphinx-build.am 2012-05-29 18:49:16 +0900 (b2f8a53)
+++ build/makefiles/sphinx-build.am 2012-05-30 10:23:17 +0900 (63ffc88)
@@ -13,8 +13,8 @@ ALLSPHINXOPTS = $(PAPEROPT_$(PAPER)) -E $(SPHINXOPTS) $(SOURCE_DIR)
SPHINX_DIR = $(abs_top_builddir)/doc/sphinx
SPHINX_BUILD = $(SPHINX_DIR)/sphinx-build.py
SPHINX_BUILD_COMMAND = \
- VERSION="$(DOCUMENT_VERSION)" \
- VERSION_FULL="$(DOCUMENT_VERSION_FULL)" \
+ DOCUMENT_VERSION="$(DOCUMENT_VERSION)" \
+ DOCUMENT_VERSION_FULL="$(DOCUMENT_VERSION_FULL)" \
LOCALE="$(LOCALE)" \
PYTHONPATH="$(SPHINX_DIR):$$PYTHONPATH" \
python $(SPHINX_BUILD)
Modified: doc/source/conf.py (+2 -2)
===================================================================
--- doc/source/conf.py 2012-05-29 18:49:16 +0900 (4f61712)
+++ doc/source/conf.py 2012-05-30 10:23:17 +0900 (312f3f9)
@@ -49,9 +49,9 @@ copyright = u'2009-' + unicode(datetime.today().year) + u', mroonga project'
# built documents.
# The short X.Y version.
-version = os.environ["VERSION"]
+version = os.environ["DOCUMENT_VERSION"]
# The full version, including alpha/beta/rc tags.
-release = version
+release = os.environ["DOCUMENT_VERSION_FULL"]
# The directories that has *.mo files.
locale_dirs = ["../locale"]