null+****@clear*****
null+****@clear*****
2010年 7月 29日 (木) 14:05:19 JST
Tasuku SUENAGA a.k.a. gunyarakun 2010-07-29 05:05:19 +0000 (Thu, 29 Jul 2010)
New Revision: 8a9b9d9449f2df3a026334a9321f46d267004237
Log:
Requires Sphinx 1.0.1 for document generation.
Modified files:
doc/ja/source/conf.py
Modified: doc/ja/source/conf.py (+8 -7)
===================================================================
--- doc/ja/source/conf.py 2010-07-29 04:54:49 +0000 (2e18d27)
+++ doc/ja/source/conf.py 2010-07-29 05:05:19 +0000 (c38c2ae)
@@ -11,7 +11,7 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-SPHINX_VERSION_REQUIRED = "1.0b2"
+SPHINX_VERSION_REQUIRED = "1.0.1"
RST2PDF_VERSION_REQUIRED = "0.14.2"
import re
@@ -25,14 +25,14 @@ from pkg_resources import parse_version
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.append(os.path.abspath('.'))
-#if parse_version(sphinx.__version__) < parse_version(SPHINX_VERSION_REQUIRED):
-# print 'sphinx version is old. %s is requred. exec "easy_install -U sphinx"' % SPHINX_VERSION_REQUIRED
-# sys.exit(1)
-
-if sphinx.__version__ != SPHINX_VERSION_REQUIRED:
- print 'sphinx version is different. %s is requred. exec "easy_install -U sphinx"' % SPHINX_VERSION_REQUIRED
+if parse_version(sphinx.__version__) < parse_version(SPHINX_VERSION_REQUIRED):
+ print 'sphinx version is old. %s is requred. exec "easy_install -U sphinx"' % SPHINX_VERSION_REQUIRED
sys.exit(1)
+#if sphinx.__version__ != SPHINX_VERSION_REQUIRED:
+# print 'sphinx version is different. %s is requred. exec "easy_install -U sphinx"' % SPHINX_VERSION_REQUIRED
+# sys.exit(1)
+
# -- General configuration -----------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be extensions
@@ -72,6 +72,7 @@ copyright = u'2009-' + unicode(datetime.today().year) + ', Brazil, Inc'
if os.environ.has_key('GROONGA_VERSION'):
version_sh = 'GROONGA_VERSION=' + os.environ['GROONGA_VERSION']
else:
+ os.system('../../../version-gen.sh')
version_sh = open(os.path.join(os.path.dirname(__file__), '../../../version.sh')).read()
release_regex = re.compile(r'^GROONGA_VERSION=(?P<release>.*)$')