traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed selection of installation directories (in 'set_final_options()') 

so that pure Python modules are installed to the platform-specific
directory if there are any extension modules in this distribution.
This commit is contained in:
Greg Ward 1999-09-13 13:58:34 +00:00
parent c9c011cd96
commit fa4eb188f4
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Lib/distutils/command/install_lib.py
View File

@ -23,15 +23,23 @@ class InstallPy (Command):
self.optimize = 1 self.optimize = 1
def set_final_options (self): def set_final_options (self):
# If we don't have a 'dir' value, we'll have to ask the 'install'
# command for one. (This usually means the user ran 'install_py'
# directly, rather than going through 'install' -- so in reality,
# 'find_command_obj()' will create an 'install' command object,
# which we then query.
# Find out from the 'build_ext' command if we were asked to build
# any extensions. If so, that means even pure-Python modules in
# this distribution have to be installed to the "platlib"
# directory.
extensions = self.get_peer_option ('build_ext', 'extensions')
if extensions:
dir_option = 'install_site_platlib'
else:
dir_option = 'install_site_lib'
# Get all the information we need to install pure Python modules
# from the umbrella 'install' command -- build (source) directory,
# install (target) directory, and whether to compile .py files.
self.set_undefined_options ('install', self.set_undefined_options ('install',
('build_lib', 'build_dir'), ('build_lib', 'build_dir'),
('install_site_lib', 'dir'), (dir_option, 'dir'),
('compile_py', 'compile'), ('compile_py', 'compile'),
('optimize_py', 'optimize')) ('optimize_py', 'optimize'))

20
Lib/distutils/command/install_py.py
View File

@ -23,15 +23,23 @@ class InstallPy (Command):
self.optimize = 1 self.optimize = 1
def set_final_options (self): def set_final_options (self):
# If we don't have a 'dir' value, we'll have to ask the 'install'
# command for one. (This usually means the user ran 'install_py'
# directly, rather than going through 'install' -- so in reality,
# 'find_command_obj()' will create an 'install' command object,
# which we then query.
# Find out from the 'build_ext' command if we were asked to build
# any extensions. If so, that means even pure-Python modules in
# this distribution have to be installed to the "platlib"
# directory.
extensions = self.get_peer_option ('build_ext', 'extensions')
if extensions:
dir_option = 'install_site_platlib'
else:
dir_option = 'install_site_lib'
# Get all the information we need to install pure Python modules
# from the umbrella 'install' command -- build (source) directory,
# install (target) directory, and whether to compile .py files.
self.set_undefined_options ('install', self.set_undefined_options ('install',
('build_lib', 'build_dir'), ('build_lib', 'build_dir'),
('install_site_lib', 'dir'), (dir_option, 'dir'),
('compile_py', 'compile'), ('compile_py', 'compile'),
('optimize_py', 'optimize')) ('optimize_py', 'optimize'))