From 47f061eef1d9c4832b9a4394e84642811356ad10 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Fri, 29 Dec 2006 01:32:46 +0000 Subject: 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 --- setuptools/command/easy_install.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'setuptools/command/easy_install.py') 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' -- cgit v1.2.3