[Python-checkins] python/dist/src/Lib/distutils ccompiler.py,1.54,1.55

2002年12月29日 09:01:00 -0800

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1:/tmp/cvs-serv25894
Modified Files:
	ccompiler.py 
Log Message:
Bug #599248: strip directories when building Python. Out-of-tree builds should work again.
Index: ccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/ccompiler.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** ccompiler.py	19 Nov 2002 13:12:27 -0000	1.54
--- ccompiler.py	29 Dec 2002 17:00:57 -0000	1.55
***************
*** 16,19 ****
--- 16,20 ----
 from distutils.dir_util import mkpath
 from distutils.dep_util import newer_pairwise, newer_group
+ from distutils.sysconfig import python_build
 from distutils.util import split_quoted, execute
 from distutils import log
***************
*** 367,371 ****

 # Get the list of expected output (object) files
! objects = self.object_filenames(sources, 0, outdir)
 assert len(objects) == len(sources)

--- 368,374 ----

 # Get the list of expected output (object) files
! objects = self.object_filenames(sources,
! strip_dir=python_build,
! output_dir=outdir)
 assert len(objects) == len(sources)

***************
*** 473,477 ****
 """
 # Get the list of expected output (object) files
! objects = self.object_filenames(sources, strip_dir=0,
 output_dir=output_dir)
 assert len(objects) == len(sources)
--- 476,480 ----
 """
 # Get the list of expected output (object) files
! objects = self.object_filenames(sources, strip_dir=python_build,
 output_dir=output_dir)
 assert len(objects) == len(sources)