diff options
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/cli-32.exe | bin | 0 -> 69632 bytes | |||
| -rw-r--r-- | setuptools/cli-64.exe | bin | 0 -> 75264 bytes | |||
| -rw-r--r-- | setuptools/cli.exe | bin | 7168 -> 69632 bytes | |||
| -rwxr-xr-x | setuptools/command/easy_install.py | 9 | ||||
| -rw-r--r-- | setuptools/gui-32.exe | bin | 0 -> 65536 bytes | |||
| -rw-r--r-- | setuptools/gui-64.exe | bin | 0 -> 75264 bytes | |||
| -rw-r--r-- | setuptools/gui.exe | bin | 7168 -> 7168 bytes |
7 files changed, 8 insertions, 1 deletions
diff --git a/setuptools/cli-32.exe b/setuptools/cli-32.exe Binary files differnew file mode 100644 index 00000000..9b7717b7 --- /dev/null +++ b/setuptools/cli-32.exe diff --git a/setuptools/cli-64.exe b/setuptools/cli-64.exe Binary files differnew file mode 100644 index 00000000..265585af --- /dev/null +++ b/setuptools/cli-64.exe diff --git a/setuptools/cli.exe b/setuptools/cli.exe Binary files differindex 8906ff77..9b7717b7 100644 --- a/setuptools/cli.exe +++ b/setuptools/cli.exe diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 853753c1..4700fe0e 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -42,6 +42,10 @@ __all__ = [ import site HAS_USER_SITE = not sys.version < "2.6" and site.ENABLE_USER_SITE +import struct +def is_64bit(): + return struct.calcsize("P") == 8 + def samefile(p1,p2): if hasattr(os.path,'samefile') and ( os.path.exists(p1) and os.path.exists(p2) @@ -1781,7 +1785,10 @@ def get_script_args(dist, executable=sys_executable, wininst=False): ext, launcher = '-script.py', 'cli.exe' old = ['.py','.pyc','.pyo'] new_header = re.sub('(?i)pythonw.exe','python.exe',header) - + if is_64bit(): + launcher = launcher.replace(".", "-64.") + else: + launcher = launcher.replace(".", "-32.") if os.path.exists(new_header[2:-1]) or sys.platform!='win32': hdr = new_header else: diff --git a/setuptools/gui-32.exe b/setuptools/gui-32.exe Binary files differnew file mode 100644 index 00000000..3f64af7d --- /dev/null +++ b/setuptools/gui-32.exe diff --git a/setuptools/gui-64.exe b/setuptools/gui-64.exe Binary files differnew file mode 100644 index 00000000..3ab4378e --- /dev/null +++ b/setuptools/gui-64.exe diff --git a/setuptools/gui.exe b/setuptools/gui.exe Binary files differindex 474838d5..8906ff77 100644 --- a/setuptools/gui.exe +++ b/setuptools/gui.exe |