X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=setup.py;h=414795620a176ddcbe342103ebc7516dce8c5566;hb=5145401fe5f9995a32757f34359623b87048ab8b;hp=cf915cc1d07205a8c6d87abffb146c33365b9f7b;hpb=dd0039c9aab9c3876535d9aca543bce7fa462924;p=jinja2.git

diff --git a/setup.py b/setup.py
index cf915cc..4147956 100644
--- a/setup.py
+++ b/setup.py
@@ -30,20 +30,14 @@ for the template designer too hard by giving him too few functionality.
 
 For more informations visit the new `Jinja2 webpage`_ and `documentation`_.
 
-The `Jinja2 tip`_ is installable via `easy_install` with ``easy_install
-Jinja2==dev``.
-
 .. _sandboxed: http://en.wikipedia.org/wiki/Sandbox_(computer_security)
 .. _Django: http://www.djangoproject.com/
 .. _Jinja2 webpage: http://jinja.pocoo.org/
 .. _documentation: http://jinja.pocoo.org/2/documentation/
-.. _Jinja2 tip: http://dev.pocoo.org/hg/jinja2-main/archive/tip.tar.gz#egg=Jinja2-dev
 """
-import os
 import sys
 
 from setuptools import setup, Extension, Feature
-from distutils.command.build_ext import build_ext
 
 debugsupport = Feature(
     'optional C debug support',
@@ -62,10 +56,25 @@ if sys.version_info >= (3, 0):
         use_2to3_fixers=['custom_fixers']
     )
 
+# ignore the old '--with-speedups' flag
+try:
+    speedups_pos = sys.argv.index('--with-speedups')
+except ValueError:
+    pass
+else:
+    sys.argv[speedups_pos] = '--with-debugsupport'
+    sys.stderr.write('*' * 74 + '\n')
+    sys.stderr.write('WARNING:\n')
+    sys.stderr.write('  the --with-speedups flag is deprecated, assuming '
+                     '--with-debugsupport\n')
+    sys.stderr.write('  For the actual speedups install the MarkupSafe '
+                     'package.\n')
+    sys.stderr.write('*' * 74 + '\n')
+
 
 setup(
     name='Jinja2',
-    version='2.6',
+    version='2.7-dev',
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',