[Python-checkins] CVS: python/dist/src setup.py,1.73.4.2,1.73.4.3

Michael Hudson mwh@users.sourceforge.net
Mon, 25 Mar 2002 05:59:30 -0800


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv20943

Modified Files:
      Tag: release22-maint
	setup.py 
Log Message:
nnorwitz's fix for:

[ 532618 ] install fails if build .so fails




Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.73.4.2
retrieving revision 1.73.4.3
diff -C2 -d -r1.73.4.2 -r1.73.4.3
*** setup.py	7 Mar 2002 10:04:49 -0000	1.73.4.2
--- setup.py	25 Mar 2002 13:59:28 -0000	1.73.4.3
***************
*** 177,182 ****
              # _built_objects attribute is stored there strictly for
              # use here.
!             for filename in self._built_objects:
!                 os.remove(filename)
  
      def get_platform (self):
--- 177,187 ----
              # _built_objects attribute is stored there strictly for
              # use here.
!             # If there is a failure, _built_objects may not be there,
!             # so catch the AttributeError and move on.
!             try:
!                 for filename in self._built_objects:
!                     os.remove(filename)
!             except AttributeError:
!                 self.announce('unable to remove files (ignored)')
  
      def get_platform (self):
***************
*** 588,592 ****
              frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
              exts.append( Extension('gestalt', ['gestaltmodule.c'],
!             		extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('MacOS', ['macosmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )
--- 593,597 ----
              frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
              exts.append( Extension('gestalt', ['gestaltmodule.c'],
!                         extra_link_args=['-framework', 'Carbon']) )
              exts.append( Extension('MacOS', ['macosmodule.c'],
                          extra_link_args=['-framework', 'Carbon']) )