Commit 342750f3 authored by Tres Seaver's avatar Tres Seaver

Merge branch 'master' of https://github.com/jaraco/buildout into jaraco-master

parents 942dad3c 2ca76a48
...@@ -26,6 +26,7 @@ import pkg_resources ...@@ -26,6 +26,7 @@ import pkg_resources
import py_compile import py_compile
import re import re
import setuptools.archive_util import setuptools.archive_util
import setuptools.command.easy_install
import setuptools.command.setopt import setuptools.command.setopt
import setuptools.package_index import setuptools.package_index
import shutil import shutil
...@@ -1104,6 +1105,10 @@ def _create_script(contents, dest): ...@@ -1104,6 +1105,10 @@ def _create_script(contents, dest):
if win32_exe.endswith('-script'): if win32_exe.endswith('-script'):
win32_exe = win32_exe[:-7] # remove "-script" win32_exe = win32_exe[:-7] # remove "-script"
win32_exe = win32_exe + '.exe' # add ".exe" win32_exe = win32_exe + '.exe' # add ".exe"
try:
new_data = setuptools.command.easy_install.get_win_launcher('cli')
except AttributeError:
# fall back for compatibility with older Distribute versions
new_data = pkg_resources.resource_string('setuptools', 'cli.exe') new_data = pkg_resources.resource_string('setuptools', 'cli.exe')
if (not os.path.exists(win32_exe) or if (not os.path.exists(win32_exe) or
(open(win32_exe, 'rb').read() != new_data) (open(win32_exe, 'rb').read() != new_data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment