Commit 066af107 authored by Greg Ward's avatar Greg Ward

Dropped any notion of allowing the user to specify the build directories:

these must come from the 'build' command.  This means we no longer need
the misconceived 'set_peer_option()' method in Command and, more importantly,
sweeps away a bunch of potential future complexity to handle this tricky
case.
parent 1b4ede5f
...@@ -74,12 +74,6 @@ class install (Command): ...@@ -74,12 +74,6 @@ class install (Command):
('install-data=', None, ('install-data=', None,
"installation directory for data files"), "installation directory for data files"),
# Build directories: where to find the files to install
('build-base=', None,
"base build directory"),
('build-lib=', None,
"build directory for all Python modules"),
# Where to install documentation (eventually!) # Where to install documentation (eventually!)
#('doc-format=', None, "format of documentation to generate"), #('doc-format=', None, "format of documentation to generate"),
#('install-man=', None, "directory for Unix man pages"), #('install-man=', None, "directory for Unix man pages"),
...@@ -113,13 +107,18 @@ class install (Command): ...@@ -113,13 +107,18 @@ class install (Command):
self.install_scripts = None self.install_scripts = None
self.install_data = None self.install_data = None
self.build_base = None
self.build_lib = None
self.build_platlib = None
self.extra_path = None self.extra_path = None
self.install_path_file = 0 self.install_path_file = 0
# These are only here as a conduit from the 'build' command to the
# 'install_*' commands that do the real work. ('build_base' isn't
# actually used anywhere, but it might be useful in future.) They
# are not user options, because if the user told the install
# command where the build directory is, that wouldn't affect the
# build command.
self.build_base = None
self.build_lib = None
#self.install_man = None #self.install_man = None
#self.install_html = None #self.install_html = None
#self.install_info = None #self.install_info = None
...@@ -242,11 +241,9 @@ class install (Command): ...@@ -242,11 +241,9 @@ class install (Command):
self.install_lib = os.path.join (self.install_lib, self.extra_dirs) self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
# Figure out the build directories, ie. where to install from # Figure out the build directories, ie. where to install from
self.set_peer_option ('build', 'build_base', self.build_base)
self.set_undefined_options ('build', self.set_undefined_options ('build',
('build_base', 'build_base'), ('build_base', 'build_base'),
('build_lib', 'build_lib'), ('build_lib', 'build_lib'))
('build_platlib', 'build_platlib'))
# Punt on doc directories for now -- after all, we're punting on # Punt on doc directories for now -- after all, we're punting on
# documentation completely! # documentation completely!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment