Fixed do_filesizeformat to actually calculate correctly, fixes #59

[jinja2.git] / Makefile

diff --git a/Makefile b/Makefile
index ca294d90636bae66e27f1ee47b0bf98b1661167b..0d89eda7e3bdd83fafccb184bf00d63f201b7311 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,15 @@
-#
-# Jinja Makefile
-# ~~~~~~~~~~~~~~
-#
-# Shortcuts for various tasks.
-#
-# :copyright: 2007 by Armin Ronacher.
-# :license: BSD, see LICENSE for more details.
-#
-
 test:
-       @(cd tests; py.test $(TESTS))
+       python setup.py test
 
-documentation:
-       @(cd docs; ./generate.py)
+release:
+       python scripts/make-release.py
 
-webpage:
-       @(cd ../www; ./generate.py)
+upload-docs:
+       $(MAKE) -C docs html dirhtml latex
+       $(MAKE) -C docs/_build/latex all-pdf
+       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/docs/
+       scp -r docs/_build/latex/Jinja2.pdf pocoo.org:/var/www/jinja.pocoo.org/docs/jinja-docs.pdf
+       scp -r docs/_build/jinja-docs.zip pocoo.org:/var/www/jinja.pocoo.org/docs/
 
-release: documentation
-       @(python2.3 setup.py release bdist_egg upload; python2.4 setup.py release bdist_egg upload; python2.5 setup.py release bdist_egg sdist upload)
+.PHONY: test