[Python-checkins] CVS: python/dist/src/Lib/distutils/command build_ext.py,1.74,1.74.4.1 build_scripts.py,1.8,1.8.6.1

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory usw-pr-cvs1:/tmp/cvs-serv14630/descr/dist/src/Lib/distutils/command

Modified Files:
      Tag: descr-branch
	build_ext.py build_scripts.py 
Log Message:
Merge of trunk tags date2001-07-21 to date2001-07-28.


Index: build_ext.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_ext.py,v
retrieving revision 1.74
retrieving revision 1.74.4.1
diff -C2 -d -r1.74 -r1.74.4.1
*** build_ext.py	2001/03/17 20:15:41	1.74
--- build_ext.py	2001/07/28 05:02:59	1.74.4.1
***************
*** 126,130 ****
          
  
!         # Make sure Python's include directories (for Python.h, config.h,
          # etc.) are in the include search path.
          py_include = sysconfig.get_python_inc()
--- 126,130 ----
          
  
!         # Make sure Python's include directories (for Python.h, pyconfig.h,
          # etc.) are in the include search path.
          py_include = sysconfig.get_python_inc()
***************
*** 593,597 ****
          # The python library is always needed on Windows.  For MSVC, this
          # is redundant, since the library is mentioned in a pragma in
!         # config.h that MSVC groks.  The other Windows compilers all seem
          # to need it mentioned explicitly, though, so that's what we do.
          # Append '_d' to the python import library on debug builds.
--- 593,597 ----
          # The python library is always needed on Windows.  For MSVC, this
          # is redundant, since the library is mentioned in a pragma in
!         # pyconfig.h that MSVC groks.  The other Windows compilers all seem
          # to need it mentioned explicitly, though, so that's what we do.
          # Append '_d' to the python import library on debug builds.

Index: build_scripts.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_scripts.py,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -C2 -d -r1.8 -r1.8.6.1
*** build_scripts.py	2001/03/02 07:28:03	1.8
--- build_scripts.py	2001/07/28 05:02:59	1.8.6.1
***************
*** 11,18 ****
  from distutils.dep_util import newer
  
! # check if Python is called on the first line with this expression.
! # This expression will leave lines using /usr/bin/env alone; presumably
! # the script author knew what they were doing...)
! first_line_re = re.compile(r'^#!(?!\s*/usr/bin/env\b).*python(\s+.*)?')
  
  class build_scripts (Command):
--- 11,16 ----
  from distutils.dep_util import newer
  
! # check if Python is called on the first line with this expression
! first_line_re = re.compile(r'^#!.*python(\s+.*)?')
  
  class build_scripts (Command):