traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

As of OS X 10.1.1 the version numbering scheme has changed. Convert all "darwin*" to "darwin" and use that for testing.

This commit is contained in:
Jack Jansen 2001-12-05 15:54:29 +00:00
parent 2d4e03b092
commit 244e761fbf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup.py
View File

@ -92,7 +92,7 @@ class PyBuildExt(build_ext):
# Platform-dependent module source and include directories # Platform-dependent module source and include directories
platform = self.get_platform() platform = self.get_platform()
if platform == 'darwin1': if platform == 'darwin':
# Mac OS X also includes some mac-specific modules # Mac OS X also includes some mac-specific modules
macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules') macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules')
moddirlist.append(macmoddir) moddirlist.append(macmoddir)
@ -177,6 +177,8 @@ class PyBuildExt(build_ext):
platform = 'cygwin' platform = 'cygwin'
elif platform[:4] =='beos': elif platform[:4] =='beos':
platform = 'beos' platform = 'beos'
elif platform[:6] == 'darwin':
platform = 'darwin'
return platform return platform
@ -203,7 +205,7 @@ class PyBuildExt(build_ext):
# Check for MacOS X, which doesn't need libm.a at all # Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m'] math_libs = ['m']
if platform in ['Darwin1.2', 'beos']: if platform in ['darwin', 'beos']:
math_libs = [] math_libs = []
# XXX Omitted modules: gl, pure, dl, SGI-specific modules # XXX Omitted modules: gl, pure, dl, SGI-specific modules
@ -459,7 +461,7 @@ class PyBuildExt(build_ext):
curses_libs = ['ncurses'] curses_libs = ['ncurses']
exts.append( Extension('_curses', ['_cursesmodule.c'], exts.append( Extension('_curses', ['_cursesmodule.c'],
libraries = curses_libs) ) libraries = curses_libs) )
elif (self.compiler.find_library_file(lib_dirs, 'curses')) and platform != 'darwin1': 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')): if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
curses_libs = ['curses', 'terminfo'] curses_libs = ['curses', 'terminfo']
@ -561,7 +563,7 @@ class PyBuildExt(build_ext):
# SunOS specific modules # SunOS specific modules
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) ) exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
if platform == 'darwin1': if platform == 'darwin':
# Mac OS X specific modules. These are ported over from MacPython # Mac OS X specific modules. These are ported over from MacPython
# and still experimental. Some (such as gestalt or icglue) are # and still experimental. Some (such as gestalt or icglue) are
# already generally useful, some (the GUI ones) really need to # already generally useful, some (the GUI ones) really need to