aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-12-29 01:32:46 +0000
committerPJ Eby <distutils-sig@python.org>2006-12-29 01:32:46 +0000
commit47f061eef1d9c4832b9a4394e84642811356ad10 (patch)
tree50e19bb4bf2eab1f8c25ca90f3b2e785d884bb96 /setuptools/command/easy_install.py
parent3f14d160421187a37ccfb91f1e7fce6d54378cb6 (diff)
downloadexternal_python_setuptools-47f061eef1d9c4832b9a4394e84642811356ad10.tar.gz
external_python_setuptools-47f061eef1d9c4832b9a4394e84642811356ad10.tar.bz2
external_python_setuptools-47f061eef1d9c4832b9a4394e84642811356ad10.zip
Partial support for cross-platform generation of bdist_wininst .exe's.
Unfortunately, bdist_wininst doesn't fix up #! lines, so python.exe or pythonw.exe have to be on PATH for generated scripts to work. This could probably be fixed up with a post-install script, but that's a job for another day. (backport from trunk) --HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4053186
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a565be4f..8f2aa457 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1408,7 +1408,7 @@ class PthDistributions(Environment):
return path
-def get_script_header(script_text, executable=sys_executable):
+def get_script_header(script_text, executable=sys_executable, wininst=False):
"""Create a #! line, getting options (if any) from script_text"""
from distutils.command.build_scripts import first_line_re
first = (script_text+'\n').splitlines()[0]
@@ -1418,6 +1418,8 @@ def get_script_header(script_text, executable=sys_executable):
options = match.group(1) or ''
if options:
options = ' '+options
+ if wininst and sys.platform!='win32':
+ executable = "python.exe"
hdr = "#!%(executable)s%(options)s\n" % locals()
if unicode(hdr,'ascii','ignore').encode('ascii') != hdr:
# Non-ascii path to sys.executable, use -x to prevent warnings
@@ -1431,8 +1433,6 @@ def get_script_header(script_text, executable=sys_executable):
return hdr
-
-
def auto_chmod(func, arg, exc):
if func is os.remove and os.name=='nt':
os.chmod(arg, stat.S_IWRITE)
@@ -1515,10 +1515,10 @@ def is_python_script(script_text, filename):
-def get_script_args(dist, executable=sys_executable):
+def get_script_args(dist, executable=sys_executable, wininst=False):
"""Yield write_script() argument tuples for a distribution's entrypoints"""
spec = str(dist.as_requirement())
- header = get_script_header("", executable)
+ header = get_script_header("", executable, wininst)
for group in 'console_scripts', 'gui_scripts':
for name,ep in dist.get_entry_map(group).items():
script_text = (
@@ -1531,7 +1531,7 @@ def get_script_args(dist, executable=sys_executable):
" load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
")\n"
) % locals()
- if sys.platform=='win32':
+ if sys.platform=='win32' or wininst:
# On Windows, add a .py extension and an .exe launcher
if group=='gui_scripts':
ext, launcher = '-script.pyw', 'gui.exe'