Merge branch 'master' of github.com:buildout/buildout

MANIFEST.in

 recursive-include src/zc *.txt
+recursive-include src/zc *.test
 include *.txt
 include *.rst

src/zc/buildout/easy_install.py

@@ -33,7 +33,6 @@ import subprocess
 import sys
 import tempfile
 import zc.buildout
-import zipimport
 
 _oprp = getattr(os.path, 'realpath', lambda path: path)
 def realpath(path):
@@ -1022,8 +1021,6 @@ base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
 """
 
 def _script(module_name, attrs, path, dest, arguments, initialization, rsetup):
-    generated = []
-    script = dest
     if is_win32:
         dest += '-script.py'
 
@@ -1042,6 +1039,8 @@ def _script(module_name, attrs, path, dest, arguments, initialization, rsetup):
 
 
 def _distutils_script(path, dest, script_content, initialization, rsetup):
+    if is_win32:
+        dest += '-script.py'
 
     lines = script_content.splitlines(True)
     if not ('#!' in lines[0]) and ('python' in lines[0]):

src/zc/buildout/easy_install.txt

@@ -912,6 +912,18 @@ Buildout also installs those:
     >>> ls(distbin)
     -  distutilsscript
 
+Like for console_scripts, the output is a list of the scripts
+generated. Likewise, on windows two files, an ``.exe`` and a script with
+``-script.py`` appended, are generated:
+
+    >>> import os, sys
+    >>> if sys.platform == 'win32':
+    ...     scripts == [os.path.join(distbin, 'distutilsscript.exe'),
+    ...                 os.path.join(distbin, 'distutilsscript-script.py')]
+    ... else:
+    ...     scripts == [os.path.join(distbin, 'distutilsscript')]
+    True
+
 It also works for zipped eggs:
 
     >>> distdir2 = tmpdir('distutilsscriptdir2')