[Distutils] Patch from the previous message

Robert Kern kern@caltech.edu
Sat Apr 7 02:13:01 2001


--MGYHOYXEY6WxJCY8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Sorry. Here it is.

-- 
Robert Kern
kern@caltech.edu

"In the fields of hell where the grass grows high
 Are the graves of dreams allowed to die."
  -- Richard Harter

--MGYHOYXEY6WxJCY8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bdist_skip.diff"

? build
Index: distutils/command/bdist.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist.py,v
retrieving revision 1.20
diff -c -r1.20 bdist.py
*** distutils/command/bdist.py	2000/10/14 04:06:40	1.20
--- distutils/command/bdist.py	2001/04/07 06:07:52
***************
*** 40,47 ****
--- 40,51 ----
                      ('dist-dir=', 'd',
                       "directory to put final built distributions in "
                       "[default: dist]"),
+                     ('skip-build', None,
+                      "skip rebuilding everything (for testing/debugging)"),
                     ]
  
+     boolean_options = ['skip-build']
+ 
      help_options = [
          ('help-formats', None,
           "lists available distribution formats", show_formats),
***************
*** 76,81 ****
--- 80,86 ----
          self.plat_name = None
          self.formats = None
          self.dist_dir = None
+         self.skip_build = 0
  
      # initialize_options()
  
Index: distutils/command/bdist_dumb.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_dumb.py,v
retrieving revision 1.16
diff -c -r1.16 bdist_dumb.py
*** distutils/command/bdist_dumb.py	2000/09/30 18:27:54	1.16
--- distutils/command/bdist_dumb.py	2001/04/07 06:07:52
***************
*** 30,38 ****
                       "creating the distribution archive"),
                      ('dist-dir=', 'd',
                       "directory to put final built distributions in"),
                     ]
  
!     boolean_options = ['keep-temp']
  
      default_format = { 'posix': 'gztar',
                         'nt': 'zip', }
--- 30,40 ----
                       "creating the distribution archive"),
                      ('dist-dir=', 'd',
                       "directory to put final built distributions in"),
+                     ('skip-build', None,
+                      "skip rebuilding everything (for testing/debugging)"),
                     ]
  
!     boolean_options = ['keep-temp', 'skip-build']
  
      default_format = { 'posix': 'gztar',
                         'nt': 'zip', }
***************
*** 44,49 ****
--- 46,52 ----
          self.format = None
          self.keep_temp = 0
          self.dist_dir = None
+         self.skip_build = 0
  
      # initialize_options()
  
***************
*** 71,80 ****
  
      def run (self):
  
!         self.run_command('build')
  
          install = self.reinitialize_command('install', reinit_subcommands=1)
          install.root = self.bdist_dir
  
          self.announce("installing to %s" % self.bdist_dir)
          self.run_command('install')
--- 74,85 ----
  
      def run (self):
  
!         if not self.skip_build:
!             self.run_command('build')
  
          install = self.reinitialize_command('install', reinit_subcommands=1)
          install.root = self.bdist_dir
+         install.skip_build = self.skip_build
  
          self.announce("installing to %s" % self.bdist_dir)
          self.run_command('install')
Index: distutils/command/bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_wininst.py,v
retrieving revision 1.20
diff -c -r1.20 bdist_wininst.py
*** distutils/command/bdist_wininst.py	2001/03/16 20:57:37	1.20
--- distutils/command/bdist_wininst.py	2001/04/07 06:07:52
***************
*** 36,41 ****
--- 36,43 ----
                       "bitmap to use for the installer instead of python-powered logo"),
                      ('title=', 't',
                       "title to display on the installer background instead of default"),
+                     ('skip-build', None,
+                      "skip rebuilding everything (for testing/debugging)"),
                     ]
  
      boolean_options = ['keep-temp']
***************
*** 49,54 ****
--- 51,57 ----
          self.dist_dir = None
          self.bitmap = None
          self.title = None
+         self.skip_build = 0
  
      # initialize_options()
  
***************
*** 79,88 ****
                    ("distribution contains extensions and/or C libraries; "
                     "must be compiled on a Windows 32 platform")
  
!         self.run_command('build')
  
          install = self.reinitialize_command('install')
          install.root = self.bdist_dir
          if os.name != 'nt':
              # Must force install to use the 'nt' scheme; we set the
              # prefix too just because it looks silly to put stuff
--- 82,93 ----
                    ("distribution contains extensions and/or C libraries; "
                     "must be compiled on a Windows 32 platform")
  
!         if not self.skip_build:
!             self.run_command('build')
  
          install = self.reinitialize_command('install')
          install.root = self.bdist_dir
+         install.skip_build = self.skip_build
          if os.name != 'nt':
              # Must force install to use the 'nt' scheme; we set the
              # prefix too just because it looks silly to put stuff

--MGYHOYXEY6WxJCY8--