diff options
| author | agronholm <none@none> | 2009-09-25 22:01:27 +0300 |
|---|---|---|
| committer | agronholm <none@none> | 2009-09-25 22:01:27 +0300 |
| commit | efa78ba0a0e1f89b92da4fa0fa6e5e029efecf3f (patch) | |
| tree | b42d2975e30e286ef9ebe2e46596ce347d89acd7 /setuptools/command/easy_install.py | |
| parent | 758eba50d92348b0f1ba43a2e6ee3a842f49ffed (diff) | |
| download | external_python_setuptools-efa78ba0a0e1f89b92da4fa0fa6e5e029efecf3f.tar.gz external_python_setuptools-efa78ba0a0e1f89b92da4fa0fa6e5e029efecf3f.tar.bz2 external_python_setuptools-efa78ba0a0e1f89b92da4fa0fa6e5e029efecf3f.zip | |
Fix script launcher creation on 64-bit Windows, patch by Jason R. Coombs (http://bugs.python.org/setuptools/issue2)
--HG--
branch : distribute
extra : rebase_source : 60c07b0639b77a3e8ff13eb12161ebe03ab47430
Diffstat (limited to 'setuptools/command/easy_install.py')
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 195139c7..4b03e185 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1603,13 +1603,14 @@ def get_script_args(dist, executable=sys_executable, wininst=False): ")\n" ) % locals() if sys.platform=='win32' or wininst: + word_size = [32, 64]['amd64' in sys.version.lower()] # On Windows/wininst, add a .py extension and an .exe launcher if group=='gui_scripts': - ext, launcher = '-script.pyw', 'gui.exe' + ext, launcher = '-script.pyw', 'gui-%d.exe' % word_size old = ['.pyw'] new_header = re.sub('(?i)python.exe','pythonw.exe',header) else: - ext, launcher = '-script.py', 'cli.exe' + ext, launcher = '-script.py', 'cli-%d.exe' % word_size old = ['.py','.pyc','.pyo'] new_header = re.sub('(?i)pythonw.exe','python.exe',header) |