[wpdev-commits] wolfpack configure.py,1.28,1.29 wolfpack.pro,1.206,1.207
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
[wpdev-commits] wolfpack configure.py,1.28,1.29 wolfpack.pro,1.206,1.207
|
From: Correa <thi...@us...> - 2004-08-23 15:58:33
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4448 Modified Files: configure.py wolfpack.pro Log Message: Experimental MacOS X support Index: wolfpack.pro =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v retrieving revision 1.206 retrieving revision 1.207 diff -C2 -d -r1.206 -r1.207 *** wolfpack.pro 19 Aug 2004 05:29:06 -0000 1.206 --- wolfpack.pro 23 Aug 2004 15:58:21 -0000 1.207 *************** *** 13,18 **** unix { - LIBS = -ldl -lutil - CONFIG += console --- 13,16 ---- Index: configure.py =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** configure.py 23 Aug 2004 05:08:21 -0000 1.28 --- configure.py 23 Aug 2004 15:58:21 -0000 1.29 *************** *** 13,16 **** --- 13,17 ---- import dircache import string + import distutils.sysconfig from optparse import OptionParser *************** *** 31,34 **** --- 32,36 ---- colorcodes["red"] = "\x1b[31;01m" colorcodes["darkred"] = "\x1b[31;06m" + colorcodes["yellow"] = "\x1b[33;01m" def nocolor(): *************** *** 43,47 **** def green( text ): return colorcodes["green"] + text + colorcodes["reset"] ! def buildLibLine( path, file ): --- 45,50 ---- def green( text ): return colorcodes["green"] + text + colorcodes["reset"] ! def yellow( text ): ! return colorcodes["yellow"] + text + colorcodes["reset"] def buildLibLine( path, file ): *************** *** 162,170 **** def checkPython(options): if sys.platform == "win32": ! PYTHONLIBSEARCHPATH = [ sys.prefix + "\Libs\python*.lib" ] ! PYTHONINCSEARCHPATH = [ sys.prefix + "\include\Python.h" ] elif sys.platform == "linux2": ! PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython*/libpython2.3*.so", \ "/usr/lib/libpython2.3*.so", \ --- 165,176 ---- def checkPython(options): + PYTHONINCSEARCHPATH = [ distutils.sysconfig.get_python_inc() ] + PYTHONLIBSEARCHPATH = [ distutils.sysconfig.get_config_vars()["DESTSHARED"] + os.path.sep + "libpython*" ] + PYTHONLIBSTATICSEARCHPATH = [] if sys.platform == "win32": ! PYTHONLIBSEARCHPATH += [ sys.prefix + "\Libs\python*.lib" ] ! PYTHONINCSEARCHPATH += [ sys.prefix + "\include\Python.h" ] elif sys.platform == "linux2": ! PYTHONLIBSEARCHPATH += [ "/usr/local/lib/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython*/libpython2.3*.so", \ "/usr/lib/libpython2.3*.so", \ *************** *** 172,176 **** "/usr/lib/[Pp]ython*/config/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython*/config/libpython2.3*.so"] ! PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.a", \ "/usr/lib/libpython2.3*.a", \ --- 178,182 ---- "/usr/lib/[Pp]ython*/config/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython*/config/libpython2.3*.so"] ! PYTHONLIBSTATICSEARCHPATH += [ "/usr/local/lib/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.a", \ "/usr/lib/libpython2.3*.a", \ *************** *** 178,185 **** "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.a"] ! PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] elif sys.platform == "freebsd4" or sys.platform == "freebsd5": ! PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.so", \ "/usr/lib/libpython2.3*.so", \ --- 184,191 ---- "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.a"] ! PYTHONINCSEARCHPATH += [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] elif sys.platform == "freebsd4" or sys.platform == "freebsd5": ! PYTHONLIBSEARCHPATH += [ "/usr/local/lib/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.so", \ "/usr/lib/libpython2.3*.so", \ *************** *** 187,191 **** "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.so"] ! PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.a", \ "/usr/lib/libpython2.3*.a", \ --- 193,197 ---- "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.so", \ "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.so"] ! PYTHONLIBSTATICSEARCHPATH += [ "/usr/local/lib/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/libpython2.3*.a", \ "/usr/lib/libpython2.3*.a", \ *************** *** 193,202 **** "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.a"] ! PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] elif sys.platform == "darwin": ! PYTHONINCSEARCHPATH = [ "/System/Library/Frameworks/Python.framework/Versions/Current/Headers/Python.h" ] ! PYTHONLIBSEARCHPATH = [ ] ! PYTHONLIBSTATICSEARCHPATH = ["/System/Library/Frameworks/Python.framework/Versions/Current/Python", \ "/System/Library/Frameworks/Python.framework/Versions/Current/lib/[Pp]ython*/config/libpython*.a", \ "/usr/local/lib/[Pp]ython*/config/libpython*.a"] --- 199,208 ---- "/usr/lib/[Pp]ython2.3*/config/libpython2.3*.a", \ "/usr/local/lib/[Pp]ython2.3*/config/libpython2.3*.a"] ! PYTHONINCSEARCHPATH += [ "/usr/local/include/[Pp]ython2.3*/Python.h", \ "/usr/include/[Pp]ython2.3*/Python.h"] elif sys.platform == "darwin": ! PYTHONINCSEARCHPATH += [ "/System/Library/Frameworks/Python.framework/Versions/Current/Headers/Python.h" ] ! PYTHONLIBSEARCHPATH += [ ] ! PYTHONLIBSTATICSEARCHPATH += ["/System/Library/Frameworks/Python.framework/Versions/Current/Python", \ "/System/Library/Frameworks/Python.framework/Versions/Current/lib/[Pp]ython*/config/libpython*.a", \ "/usr/local/lib/[Pp]ython*/config/libpython*.a"] *************** *** 226,230 **** sys.stdout.write( "Checking CPU byte order... %s\n" % sys.byteorder ) if sys.byteorder != 'little': ! sys.stdout.write(red("Warning:") + " Wolfpack support for big endian systems is completely experimental and unlikey to work\n" ) sys.stdout.write( "Searching for Python library... " ) --- 232,236 ---- sys.stdout.write( "Checking CPU byte order... %s\n" % sys.byteorder ) if sys.byteorder != 'little': ! sys.stdout.write(yellow("Warning:") + " Wolfpack support for big endian systems is completely experimental and unlikey to work\n" ) sys.stdout.write( "Searching for Python library... " ) |
