Merge branch '1.2.x'

Greg Turnquist · Greg Turnquist · commit 63bcc88da90b · 2011-05-04T17:39:58.000-05:00
diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py
@@ -13,6 +13,17 @@
 
 import sys, os
 
+# Read the properties file to harvest version info.
+p = {}
+with open("../../../springpython.properties") as f:
+    lines = f.readlines()
+    for line in lines:
+        if "=" in line and not line.startswith("#"):
+            (key, value) = line.split("=")
+            p[key] = value[:-1]
+
+print p
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -41,16 +52,20 @@
 
 # General information about the project.
 project = u'Spring Python'
-copyright = u'2010, Greg Turnquist, Dariusz Suchojad'
+copyright = u'2006-2011, Greg Turnquist, Dariusz Suchojad'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
+version = ".".join(p["version"].split(".")[0:2])
+
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0.RC1'
+if "build.stamp" in p:
+    release = p["version"] + "." + p["build.stamp"]
+else:
+    release = p["version"] + "." + p["release.type"].upper()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
