[Python-checkins] CVS: python/dist/src setup.py,1.76,1.77
Michael Hudson
mwh@users.sourceforge.net
Wed, 23 Jan 2002 07:04:43 -0800
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv12571
Modified Files:
setup.py
Log Message:
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?
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** setup.py 2002/01/21 23:10:36 1.76
--- setup.py 2002/01/23 15:04:41 1.77
***************
*** 72,76 ****
self.announce("WARNING: multiple copies of %s found"%module)
return os.path.join(list[0], module)
!
class PyBuildExt(build_ext):
--- 72,76 ----
self.announce("WARNING: multiple copies of %s found"%module)
return os.path.join(list[0], module)
!
class PyBuildExt(build_ext):
***************
*** 94,101 ****
srcdir = os.path.normpath(srcdir)
moddir = os.path.normpath(moddir)
!
moddirlist = [moddir]
incdirlist = ['./Include']
!
# Platform-dependent module source and include directories
platform = self.get_platform()
--- 94,101 ----
srcdir = os.path.normpath(srcdir)
moddir = os.path.normpath(moddir)
!
moddirlist = [moddir]
incdirlist = ['./Include']
!
# Platform-dependent module source and include directories
platform = self.get_platform()
***************
*** 123,127 ****
# Parse Modules/Setup to figure out which modules are turned
! # on in the file.
input = text_file.TextFile('Modules/Setup', join_lines=1)
remove_modules = []
--- 123,127 ----
# Parse Modules/Setup to figure out which modules are turned
! # on in the file.
input = text_file.TextFile('Modules/Setup', join_lines=1)
remove_modules = []
***************
*** 132,140 ****
remove_modules.append( line[0] )
input.close()
!
for ext in self.extensions[:]:
if ext.name in remove_modules:
self.extensions.remove(ext)
!
# When you run "make CC=altcc" or something similar, you really want
# those environment variables passed into the setup.py phase. Here's
--- 132,140 ----
remove_modules.append( line[0] )
input.close()
!
for ext in self.extensions[:]:
if ext.name in remove_modules:
self.extensions.remove(ext)
!
# When you run "make CC=altcc" or something similar, you really want
# those environment variables passed into the setup.py phase. Here's
***************
*** 165,172 ****
# 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
try:
__import__(ext.name)
--- 165,172 ----
# 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
try:
__import__(ext.name)
***************
*** 218,231 ****
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
! inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
platform = self.get_platform()
!
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
if platform in ['darwin', 'beos']:
math_libs = []
!
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
--- 218,231 ----
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
! inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
platform = self.get_platform()
!
# Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m']
if platform in ['darwin', 'beos']:
math_libs = []
!
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
***************
*** 424,428 ****
elif self.compiler.find_library_file(lib_dirs, 'db'):
dblib = ['db']
!
db185_incs = find_file('db_185.h', inc_dirs,
['/usr/include/db3', '/usr/include/db2'])
--- 424,428 ----
elif self.compiler.find_library_file(lib_dirs, 'db'):
dblib = ['db']
!
db185_incs = find_file('db_185.h', inc_dirs,
['/usr/include/db3', '/usr/include/db2'])
***************
*** 485,490 ****
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.
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
curses_libs = ['curses', 'terminfo']
--- 485,490 ----
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.
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
curses_libs = ['curses', 'terminfo']
***************
*** 578,586 ****
libraries = ['expat']) )
! # Dynamic loading module
dl_inc = find_file('dlfcn.h', [], inc_dirs)
if dl_inc is not None:
! exts.append( Extension('dl', ['dlmodule.c']) )
!
# Platform-specific libraries
if platform == 'linux2':
--- 578,586 ----
libraries = ['expat']) )
! # Dynamic loading module
dl_inc = find_file('dlfcn.h', [], inc_dirs)
if dl_inc is not None:
! exts.append( Extension('dl', ['dlmodule.c']) )
!
# Platform-specific libraries
if platform == 'linux2':
***************
*** 591,595 ****
# SunOS specific modules
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
!
if platform == 'darwin':
# Mac OS X specific modules. These are ported over from MacPython
--- 591,595 ----
# SunOS specific modules
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
!
if platform == 'darwin':
# Mac OS X specific modules. These are ported over from MacPython
***************
*** 604,661 ****
exts.append( Extension('gestalt', ['gestaltmodule.c']) )
exts.append( Extension('MacOS', ['macosmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('icglue', ['icgluemodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('macfs',
['macfsmodule.c',
'../Python/getapplbycreator.c'],
! 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']) )
if frameworkdir:
exts.append( Extension('Nav', ['Nav.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_AE', ['ae/_AEmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_App', ['app/_Appmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_CarbonEvt', ['carbonevt/_CarbonEvtmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_CG', ['cg/_CGmodule.c'],
! extra_link_args=['-framework', 'ApplicationServices',
'-framework', 'Carbon']) )
exts.append( Extension('_Cm', ['cm/_Cmmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Ctl', ['ctl/_Ctlmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Dlg', ['dlg/_Dlgmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Drag', ['drag/_Dragmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Evt', ['evt/_Evtmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Fm', ['fm/_Fmmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Icn', ['icn/_Icnmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_List', ['list/_Listmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Menu', ['menu/_Menumodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Mlte', ['mlte/_Mltemodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Qd', ['qd/_Qdmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Qdoffs', ['qdoffs/_Qdoffsmodule.c'],
! 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']) )
exts.append( Extension('_TE', ['te/_TEmodule.c'],
! 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
--- 604,661 ----
exts.append( Extension('gestalt', ['gestaltmodule.c']) )
exts.append( Extension('MacOS', ['macosmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('icglue', ['icgluemodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('macfs',
['macfsmodule.c',
'../Python/getapplbycreator.c'],
! 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']) )
if frameworkdir:
exts.append( Extension('Nav', ['Nav.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_AE', ['ae/_AEmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_App', ['app/_Appmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_CarbonEvt', ['carbonevt/_CarbonEvtmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_CG', ['cg/_CGmodule.c'],
! extra_link_args=['-framework', 'ApplicationServices',
'-framework', 'Carbon']) )
exts.append( Extension('_Cm', ['cm/_Cmmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Ctl', ['ctl/_Ctlmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Dlg', ['dlg/_Dlgmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Drag', ['drag/_Dragmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Evt', ['evt/_Evtmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Fm', ['fm/_Fmmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Icn', ['icn/_Icnmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_List', ['list/_Listmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Menu', ['menu/_Menumodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Mlte', ['mlte/_Mltemodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Qd', ['qd/_Qdmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('_Qdoffs', ['qdoffs/_Qdoffsmodule.c'],
! 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']) )
exts.append( Extension('_TE', ['te/_TEmodule.c'],
! 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
***************
*** 666,670 ****
["../waste/Static Libraries"])
if waste_incs != None and waste_libs != None:
! exts.append( Extension('waste',
['waste/wastemodule.c',
'Mac/Wastemods/WEObjectHandlers.c',
--- 666,670 ----
["../waste/Static Libraries"])
if waste_incs != None and waste_libs != None:
! exts.append( Extension('waste',
['waste/wastemodule.c',
'Mac/Wastemods/WEObjectHandlers.c',
***************
*** 678,683 ****
) )
exts.append( Extension('_Win', ['win/_Winmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
!
self.extensions.extend(exts)
--- 678,683 ----
) )
exts.append( Extension('_Win', ['win/_Winmodule.c'],
! extra_link_args=['-framework', 'Carbon']) )
!
self.extensions.extend(exts)
***************
*** 688,692 ****
def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module.
!
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
--- 688,692 ----
def detect_tkinter(self, inc_dirs, lib_dirs):
# The _tkinter module.
!
# Assume we haven't found any of the libraries or include files
# The versions with dots are used on Unix, and the versions without
***************
*** 695,703 ****
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:
# Exit the loop when we've found the Tcl/Tk libraries
break
--- 695,703 ----
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:
# Exit the loop when we've found the Tcl/Tk libraries
break
***************
*** 788,792 ****
install.initialize_options(self)
self.warn_dir=0
!
def main():
# turn off warnings when deprecated modules are imported
--- 788,792 ----
install.initialize_options(self)
self.warn_dir=0
!
def main():
# turn off warnings when deprecated modules are imported