|
 |
68d566a |
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
|
|
|
68d566a |
index 6d85a31..cd9f9ac 100755
|
|
|
68d566a |
--- a/setuptools/command/easy_install.py
|
|
|
68d566a |
+++ b/setuptools/command/easy_install.py
|
|
|
68d566a |
@@ -147,7 +147,9 @@ class easy_install(Command):
|
|
|
68d566a |
"allow building eggs from local checkouts"),
|
|
|
68d566a |
('version', None, "print version information and exit"),
|
|
|
68d566a |
('no-find-links', None,
|
|
|
68d566a |
- "Don't load find-links defined in packages being installed")
|
|
|
68d566a |
+ "Don't load find-links defined in packages being installed"),
|
|
|
68d566a |
+ ('executable=', 'e',
|
|
|
68d566a |
+ "specify final destination interpreter path")
|
|
|
68d566a |
]
|
|
|
68d566a |
boolean_options = [
|
|
|
68d566a |
'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
|
|
|
68d566a |
@@ -210,6 +212,7 @@ class easy_install(Command):
|
|
|
68d566a |
self.distribution._set_command_options(
|
|
|
68d566a |
self, self.distribution.get_option_dict('easy_install')
|
|
|
68d566a |
)
|
|
|
68d566a |
+ self.executable = None
|
|
|
68d566a |
|
|
|
68d566a |
def delete_blockers(self, blockers):
|
|
|
68d566a |
extant_blockers = (
|
|
|
68d566a |
@@ -359,6 +362,8 @@ class easy_install(Command):
|
|
|
68d566a |
"No urls, filenames, or requirements specified (see --help)")
|
|
|
68d566a |
|
|
|
68d566a |
self.outputs = []
|
|
|
68d566a |
+ if self.executable is None:
|
|
|
68d566a |
+ self.executable = os.path.normpath(sys.executable)
|
|
|
68d566a |
|
|
|
68d566a |
def _fix_install_dir_for_user_site(self):
|
|
|
68d566a |
"""
|
|
|
68d566a |
@@ -786,7 +791,8 @@ class easy_install(Command):
|
|
|
68d566a |
def install_wrapper_scripts(self, dist):
|
|
|
68d566a |
if self.exclude_scripts:
|
|
|
68d566a |
return
|
|
|
68d566a |
- for args in ScriptWriter.best().get_args(dist):
|
|
|
68d566a |
+ for args in ScriptWriter.best().get_args(
|
|
|
68d566a |
+ dist, executable=self.executable):
|
|
|
68d566a |
self.write_script(*args)
|
|
|
68d566a |
|
|
|
68d566a |
def install_script(self, dist, script_name, script_text, dev_path=None):
|
|
|
68d566a |
@@ -972,7 +978,7 @@ class easy_install(Command):
|
|
|
68d566a |
# delete entry-point scripts to avoid duping
|
|
|
68d566a |
self.delete_blockers([
|
|
|
68d566a |
os.path.join(script_dir, args[0])
|
|
|
68d566a |
- for args in ScriptWriter.get_args(dist)
|
|
|
68d566a |
+ for args in ScriptWriter.get_args(dist, executable=self.executable)
|
|
|
68d566a |
])
|
|
|
68d566a |
# Build .egg file from tmpdir
|
|
|
68d566a |
bdist_egg.make_zipfile(
|
|
|
68d566a |
@@ -2042,13 +2048,13 @@ class ScriptWriter(object):
|
|
|
68d566a |
return cmd.as_header()
|
|
|
68d566a |
|
|
|
68d566a |
@classmethod
|
|
|
68d566a |
- def get_args(cls, dist, header=None):
|
|
|
68d566a |
+ def get_args(cls, dist, header=None, executable=None):
|
|
|
68d566a |
"""
|
|
|
68d566a |
Yield write_script() argument tuples for a distribution's
|
|
|
68d566a |
console_scripts and gui_scripts entry points.
|
|
|
68d566a |
"""
|
|
|
68d566a |
if header is None:
|
|
|
68d566a |
- header = cls.get_header()
|
|
|
68d566a |
+ header = cls.get_header(executable=executable)
|
|
|
68d566a |
spec = str(dist.as_requirement())
|
|
|
68d566a |
for type_ in 'console', 'gui':
|
|
|
68d566a |
group = type_ + '_scripts'
|
|
|
68d566a |
diff --git a/setuptools/command/install.py b/setuptools/command/install.py
|
|
|
68d566a |
index 31a5ddb..e468d05 100644
|
|
|
68d566a |
--- a/setuptools/command/install.py
|
|
|
68d566a |
+++ b/setuptools/command/install.py
|
|
|
68d566a |
@@ -99,6 +99,7 @@ class install(orig.install):
|
|
|
68d566a |
|
|
|
68d566a |
cmd = easy_install(
|
|
|
68d566a |
self.distribution, args="x", root=self.root, record=self.record,
|
|
|
68d566a |
+ executable=self.executable,
|
|
|
68d566a |
)
|
|
|
68d566a |
cmd.ensure_finalized() # finalize before bdist_egg munges install cmd
|
|
|
68d566a |
cmd.always_copy_from = '.' # make sure local-dir eggs get installed
|
|
|
68d566a |
diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py
|
|
|
68d566a |
index 1623427..570415d 100755
|
|
|
68d566a |
--- a/setuptools/command/install_scripts.py
|
|
|
68d566a |
+++ b/setuptools/command/install_scripts.py
|
|
|
68d566a |
@@ -30,7 +30,8 @@ class install_scripts(orig.install_scripts):
|
|
|
68d566a |
ei_cmd.egg_base, PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info),
|
|
|
68d566a |
ei_cmd.egg_name, ei_cmd.egg_version,
|
|
|
68d566a |
)
|
|
|
68d566a |
- bs_cmd = self.get_finalized_command('build_scripts')
|
|
|
68d566a |
+ bs_cmd = (self.get_finalized_command('build_scripts', create=False) or
|
|
|
68d566a |
+ self.get_finalized_command('install'))
|
|
|
68d566a |
exec_param = getattr(bs_cmd, 'executable', None)
|
|
|
68d566a |
bw_cmd = self.get_finalized_command("bdist_wininst")
|
|
|
68d566a |
is_wininst = getattr(bw_cmd, '_is_running', False)
|