Merge branch '2.5-maintenance'

[jinja2.git] / Makefile

diff --git a/Makefile b/Makefile
index eb6d0731846bc9cac206380827bc8a8b43f02875..5cccbccb2ba2ecdc9eee4054e285c0a53ff66d57 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,10 @@
-#
-# Jinja Makefile
-# ~~~~~~~~~~~~~~
-#
-# Shortcuts for various tasks.
-#
-# :copyright: 2007 by Armin Ronacher.
-# :license: BSD, see LICENSE for more details.
-#
-
 test:
-       @(cd tests; py.test $(TESTS))
-
-documentation:
-       @(cd docs; ./generate.py)
+       python setup.py test
 
-webpage:
-       @(cd www; ./generate.py)
+upload-docs:
+       $(MAKE) -C docs html dirhtml
+       cd docs/_build/; mv html jinja-docs; zip -r jinja-docs.zip jinja-docs; mv jinja-docs html
+       scp -r docs/_build/dirhtml/* pocoo.org:/var/www/jinja.pocoo.org/
+       scp -r docs/_build/jinja-docs.zip pocoo.org:/var/www/jinja.pocoo.org/
 
-release:
-       @(python2.3 setup.py release bdist_egg; python2.4 setup.py release bdist_egg; python2.5 setup.py release bdist_egg sdist)
+.PHONY: test