diff options
| author | agronholm <none@none> | 2009-10-20 01:37:01 +0300 |
|---|---|---|
| committer | agronholm <none@none> | 2009-10-20 01:37:01 +0300 |
| commit | e6e0e5add9321df50c5da9ee2f1650740024c8ed (patch) | |
| tree | 43b3edb487a977df31cc2236469960ed277ee60d /setuptools | |
| parent | 748696a763c3b57aff3b4f39c4461c5a6b7ef4ee (diff) | |
| download | python-setuptools-git-e6e0e5add9321df50c5da9ee2f1650740024c8ed.tar.gz | |
Reversing patch for 64-bit Windows script launcher, applied PJE's simpler solution instead
--HG--
branch : distribute
extra : rebase_source : 320927dbc962a262853cae7d8b3734794bb9f21d
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/cli-32.exe | bin | 65536 -> 0 bytes | |||
| -rw-r--r-- | setuptools/cli-64.exe | bin | 74240 -> 0 bytes | |||
| -rw-r--r-- | setuptools/cli.exe | bin | 0 -> 7168 bytes | |||
| -rwxr-xr-x | setuptools/command/easy_install.py | 5 | ||||
| -rw-r--r-- | setuptools/gui-32.exe | bin | 65536 -> 0 bytes | |||
| -rw-r--r-- | setuptools/gui-64.exe | bin | 74240 -> 0 bytes | |||
| -rw-r--r-- | setuptools/gui.exe | bin | 0 -> 7168 bytes |
7 files changed, 2 insertions, 3 deletions
diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe Binary files differdeleted file mode 100644 index dd63bbfc..00000000 --- a/setuptools/cli-32.exe +++ /dev/null diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe Binary files differdeleted file mode 100644 index cc7ced50..00000000 --- a/setuptools/cli-64.exe +++ /dev/null diff --git a/setuptools/cli.exe b/setuptools/cli.exe Binary files differnew file mode 100644 index 00000000..8906ff77 --- /dev/null +++ b/setuptools/cli.exe diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 4b03e185..195139c7 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -1603,14 +1603,13 @@ 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-%d.exe' % word_size + ext, launcher = '-script.pyw', 'gui.exe' old = ['.pyw'] new_header = re.sub('(?i)python.exe','pythonw.exe',header) else: - ext, launcher = '-script.py', 'cli-%d.exe' % word_size + ext, launcher = '-script.py', 'cli.exe' old = ['.py','.pyc','.pyo'] new_header = re.sub('(?i)pythonw.exe','python.exe',header) diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe Binary files differdeleted file mode 100644 index 71838207..00000000 --- a/setuptools/gui-32.exe +++ /dev/null diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe Binary files differdeleted file mode 100644 index 7fbfb889..00000000 --- a/setuptools/gui-64.exe +++ /dev/null diff --git a/setuptools/gui.exe b/setuptools/gui.exe Binary files differnew file mode 100644 index 00000000..474838d5 --- /dev/null +++ b/setuptools/gui.exe |