[Python-checkins] CVS: distutils/distutils msvccompiler.py,1.37,1.38

Greg Ward python-dev@python.org
Thu, 3 Aug 2000 18:29:29 -0700


Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv1176

Modified Files:
	msvccompiler.py 
Log Message:
Added 'debug' flag to 'find_library_file()', and changed code to handle it.

Index: msvccompiler.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/msvccompiler.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** msvccompiler.py	2000/08/02 00:01:56	1.37
--- msvccompiler.py	2000/08/04 01:29:27	1.38
***************
*** 475,485 ****
  
  
!     def find_library_file (self, dirs, lib):
! 
          for dir in dirs:
!             libfile = os.path.join (dir, self.library_filename (lib))
!             if os.path.exists (libfile):
!                 return libfile
! 
          else:
              # Oops, didn't find it in *any* of 'dirs'
--- 475,490 ----
  
  
!     def find_library_file (self, dirs, lib, debug=0):
!         # Prefer a debugging library if found (and requested), but deal
!         # with it if we don't have one.
!         if debug:
!             try_names = [lib + "_d", lib]
!         else:
!             try_names = [lib]
          for dir in dirs:
!             for name in try_names:
!                 libfile = os.path.join(dir, self.library_filename (name))
!                 if os.path.exists(libfile):
!                     return libfile
          else:
              # Oops, didn't find it in *any* of 'dirs'