diff options
| author | guyroz <none@none> | 2011-09-20 00:30:09 +0300 |
|---|---|---|
| committer | guyroz <none@none> | 2011-09-20 00:30:09 +0300 |
| commit | 7b263a6234594d272da9c664a62115963a44edfd (patch) | |
| tree | 6c5b7bc67656b701c17fb622d2db69a728ee6ad9 /setuptools/command/easy_install.py | |
| parent | 3b8de2876b38e5b2afc4210e6d37c5b90fecb8a4 (diff) | |
| parent | a34c88660ad2ee5ef9c58cec0bb1deffbb8202d3 (diff) | |
| download | python-setuptools-git-7b263a6234594d272da9c664a62115963a44edfd.tar.gz | |
merging issues_207_238 to master
--HG--
branch : distribute
extra : rebase_source : ffa072934d0623e442744b70426ac3c06326e2b8
Diffstat (limited to 'setuptools/command/easy_install.py')
| -rwxr-xr-x | setuptools/command/easy_install.py | 9 |
1 files changed, 8 insertions, 1 deletions
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: |