mirror of https://github.com/python/cpython
Sjoerd Mullender pointed out that setup.py contained some tabs,
so I threw reindent.py at it and look what happened! Did setup.py escape Tim's regular whitespace normalizations?
This commit is contained in:
Michael W. Hudson
parent
ea3ceaa913
commit
5b10910d7a
74
setup.py
74
setup.py
|
|
@ -164,10 +164,10 @@ class PyBuildExt(build_ext):
|
|||
# Workaround for Mac OS X: The Carbon-based modules cannot be
|
||||
# reliably imported into a command-line Python
|
||||
if 'Carbon' in ext.extra_link_args:
|
||||
self.announce(
|
||||
'WARNING: skipping import check for Carbon-based "%s"' %
|
||||
ext.name)
|
||||
return
|
||||
self.announce(
|
||||
'WARNING: skipping import check for Carbon-based "%s"' %
|
||||
ext.name)
|
||||
return
|
||||
try:
|
||||
__import__(ext.name)
|
||||
except ImportError:
|
||||
|
|
@ -484,8 +484,8 @@ class PyBuildExt(build_ext):
|
|||
libraries = curses_libs) )
|
||||
elif (self.compiler.find_library_file(lib_dirs, 'curses')
|
||||
and platform != 'darwin'):
|
||||
# OSX has an old Berkeley curses, not good enough for
|
||||
# the _curses module.
|
||||
# OSX has an old Berkeley curses, not good enough for
|
||||
# the _curses module.
|
||||
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
|
||||
curses_libs = ['curses', 'terminfo']
|
||||
else:
|
||||
|
|
@ -577,10 +577,10 @@ class PyBuildExt(build_ext):
|
|||
define_macros = expat_defs,
|
||||
libraries = ['expat']) )
|
||||
|
||||
# Dynamic loading module
|
||||
# Dynamic loading module
|
||||
dl_inc = find_file('dlfcn.h', [], inc_dirs)
|
||||
if dl_inc is not None:
|
||||
exts.append( Extension('dl', ['dlmodule.c']) )
|
||||
exts.append( Extension('dl', ['dlmodule.c']) )
|
||||
|
||||
# Platform-specific libraries
|
||||
if platform == 'linux2':
|
||||
|
|
@ -603,60 +603,60 @@ class PyBuildExt(build_ext):
|
|||
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
|
||||
exts.append( Extension('gestalt', ['gestaltmodule.c']) )
|
||||
exts.append( Extension('MacOS', ['macosmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('icglue', ['icgluemodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('macfs',
|
||||
['macfsmodule.c',
|
||||
'../Python/getapplbycreator.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_CF', ['cf/_CFmodule.c']) )
|
||||
exts.append( Extension('_Res', ['res/_Resmodule.c']) )
|
||||
exts.append( Extension('_Snd', ['snd/_Sndmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
if frameworkdir:
|
||||
exts.append( Extension('Nav', ['Nav.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_AE', ['ae/_AEmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_App', ['app/_Appmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_CarbonEvt', ['carbonevt/_CarbonEvtmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_CG', ['cg/_CGmodule.c'],
|
||||
extra_link_args=['-framework', 'ApplicationServices',
|
||||
extra_link_args=['-framework', 'ApplicationServices',
|
||||
'-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Cm', ['cm/_Cmmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Ctl', ['ctl/_Ctlmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Dlg', ['dlg/_Dlgmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Drag', ['drag/_Dragmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Evt', ['evt/_Evtmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Fm', ['fm/_Fmmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Icn', ['icn/_Icnmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_List', ['list/_Listmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Menu', ['menu/_Menumodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Mlte', ['mlte/_Mltemodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Qd', ['qd/_Qdmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Qdoffs', ['qdoffs/_Qdoffsmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
|
||||
extra_link_args=['-framework', 'QuickTime',
|
||||
'-framework', 'Carbon']) )
|
||||
exts.append( Extension('_Scrap', ['scrap/_Scrapmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
exts.append( Extension('_TE', ['te/_TEmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
# As there is no standardized place (yet) to put user-installed
|
||||
# Mac libraries on OSX you should put a symlink to your Waste
|
||||
# installation in the same folder as your python source tree.
|
||||
|
|
@ -677,7 +677,7 @@ class PyBuildExt(build_ext):
|
|||
extra_link_args = ['-framework', 'Carbon'],
|
||||
) )
|
||||
exts.append( Extension('_Win', ['win/_Winmodule.c'],
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
extra_link_args=['-framework', 'Carbon']) )
|
||||
|
||||
self.extensions.extend(exts)
|
||||
|
||||
|
|
@ -694,11 +694,11 @@ class PyBuildExt(build_ext):
|
|||
tcllib = tklib = tcl_includes = tk_includes = None
|
||||
for version in ['8.4', '84', '8.3', '83', '8.2',
|
||||
'82', '8.1', '81', '8.0', '80']:
|
||||
tklib = self.compiler.find_library_file(lib_dirs,
|
||||
'tk' + version )
|
||||
tcllib = self.compiler.find_library_file(lib_dirs,
|
||||
'tcl' + version )
|
||||
if tklib and tcllib:
|
||||
tklib = self.compiler.find_library_file(lib_dirs,
|
||||
'tk' + version )
|
||||
tcllib = self.compiler.find_library_file(lib_dirs,
|
||||
'tcl' + version )
|
||||
if tklib and tcllib:
|
||||
# Exit the loop when we've found the Tcl/Tk libraries
|
||||
break
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue