add to gitignore, remove submodule for themes, use Pyramid-style makefile

This commit is contained in:
Chris McDonough
2012-02-14 21:29:35 -05:00
parent 9b4a641520
commit 1a926ca464
4 changed files with 5 additions and 10 deletions

3
.gitignore vendored
View File

@@ -19,4 +19,5 @@ build/
dist/ dist/
colander/coverage.xml colander/coverage.xml
distribute*.gz distribute*.gz
venv venv/
env*/

3
.gitmodules vendored
View File

@@ -1,3 +0,0 @@
[submodule "docs/_themes"]
path = docs/_themes
url = git://github.com/Pylons/pylons_sphinx_theme.git

View File

@@ -2,7 +2,7 @@
# #
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS = SPHINXOPTS = -W
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
PAPER = PAPER =
@@ -25,7 +25,7 @@ help:
clean: clean:
-rm -rf _build/* -rm -rf _build/*
html: _themes html:
mkdir -p _build/html _build/doctrees mkdir -p _build/html _build/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
@echo @echo
@@ -47,7 +47,7 @@ pickle:
web: pickle web: pickle
htmlhelp: _themes htmlhelp:
mkdir -p _build/htmlhelp _build/doctrees mkdir -p _build/htmlhelp _build/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
@echo @echo
@@ -84,5 +84,3 @@ epub:
@echo @echo
@echo "Build finished. The epub file is in _build/epub." @echo "Build finished. The epub file is in _build/epub."
_themes:
cd ..; git submodule update --init; cd docs

Submodule docs/_themes deleted from eed33411e3