]> granicus.if.org Git - python/commitdiff
Dropped any notion of allowing the user to specify the build directories:
authorGreg Ward <gward@python.net>
Wed, 22 Mar 2000 00:30:54 +0000 (00:30 +0000)
committerGreg Ward <gward@python.net>
Wed, 22 Mar 2000 00:30:54 +0000 (00:30 +0000)
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.

Lib/distutils/command/install.py

index 13baa1a7568ac4ecd928b7d2def7741cbb13e683..a1b5d06aec39f4fda613e18d6aa8b0575408014f 100644 (file)
@@ -74,12 +74,6 @@ class install (Command):
         ('install-data=', None,
          "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!)
         #('doc-format=', None, "format of documentation to generate"),
         #('install-man=', None, "directory for Unix man pages"),
@@ -113,13 +107,18 @@ class install (Command):
         self.install_scripts = None
         self.install_data = None
 
-        self.build_base = None
-        self.build_lib = None
-        self.build_platlib = None
-
         self.extra_path = None
         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_html = None
         #self.install_info = None
@@ -242,11 +241,9 @@ class install (Command):
         self.install_lib = os.path.join (self.install_lib, self.extra_dirs)
 
         # 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',
                                     ('build_base', 'build_base'),
-                                    ('build_lib', 'build_lib'),
-                                    ('build_platlib', 'build_platlib'))
+                                    ('build_lib', 'build_lib'))
 
         # Punt on doc directories for now -- after all, we're punting on
         # documentation completely!