set version in Makefile before building html

--HG--
rename : sphinx/pkg/conf.py => docs/sphinx/pkg/conf.py
rename : sphinx/web/conf.py => docs/sphinx/web/conf.py
rename : sphinx/web/templates/layout.html => docs/sphinx/web/templates/layout.html

Author: dhellmann

Makefile

@@ -1,3 +1,4 @@
+export VERSION=$(shell python setup.py --version)
 
 .PHONY: sdist
 sdist: html
@@ -9,6 +10,9 @@ html:
 	(cd docs && $(MAKE) html)
 	cp -r docs/build/html virtualenvwrapper/docs
 
+.PHONY: website
+website: 
+
 TEST_SCRIPTS=$(wildcard tests/test*.sh)
 
 .PHONY: test test-bash test-sh test-zsh test-loop

docs/source/conf.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # virtualenvwrapper documentation build configuration file, created by
-# sphinx-quickstart on Wed Mar 31 21:25:16 2010.
+# sphinx-quickstart on Thu May 28 22:35:13 2009.
 #
 # This file is execfile()d with the current directory set to its containing dir.
 #
@@ -22,10 +22,10 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc']
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -38,16 +38,16 @@
 
 # General information about the project.
 project = u'virtualenvwrapper'
-copyright = u'2010, Doug Hellmann'
+copyright = u'2009, Doug Hellmann'
 
 # 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 = '2.0'
+version = os.environ['VERSION']
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -64,7 +64,7 @@
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = []
+exclude_trees = ['_build']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -91,7 +91,7 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
+html_theme = 'sphinxdoc'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -120,7 +120,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -138,10 +138,10 @@
 #html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_use_modindex = True
+html_use_modindex = False
 
 # If false, no index is generated.
-#html_use_index = True
+html_use_index = False
 
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False