From: <gha...@us...> - 2006-06-01 14:38:21
|
Update of /cvsroot/pypgsql/pypgsql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16219 Modified Files: setup.py Log Message: 01JUN2006 gh Removed RPM-specific hack. Use pg_config on win32. Index: setup.py =================================================================== RCS file: /cvsroot/pypgsql/pypgsql/setup.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** setup.py 26 Sep 2005 08:08:17 -0000 1.25 --- setup.py 1 Jun 2006 14:38:18 -0000 1.26 *************** *** 15,19 **** # pyPgSQL. | #=======================================================================| ! # Copyright 2001, 2002 by Gerhard Haering. | # All rights reserved. | # | --- 15,19 ---- # pyPgSQL. | #=======================================================================| ! # Copyright 2001 - 2006 by Gerhard Haering. | # All rights reserved. | # | *************** *** 45,48 **** --- 45,49 ---- # Date Ini Description | # --------- --- ------------------------------------------------------- | + # 01JUN2006 gh Removed RPM-specific hack. Use pg_config on win32. | # 26SEP2005 gh Changed win32 build process to use MSVC.NET (needed | # for Python 2.4, and add an additonal needed library | *************** *** 83,87 **** from distutils.extension import Extension ! __version__ = "2.4" # Define the runtime library path for this module. It starts out as None. --- 84,88 ---- from distutils.extension import Extension ! __version__ = "2.5" # Define the runtime library path for this module. It starts out as None. *************** *** 110,116 **** include_dirs = ["/usr/include", "/usr/local/pgsql/include", "/usr/include/postgresql"] library_dirs = ["/usr/lib"] - - # XXX: This is an ugly hack to make bdist_rpm find the include files. - include_dirs.append("../" * 5) elif sys.platform[:8] == "unixware": LOCALBASE = os.environ.get('LOCALBASE', '/usr/local/pgsql') --- 111,114 ---- *************** *** 143,160 **** optional_libs += ["ssl", "crypto"] elif sys.platform == "win32": ! # This works with the PostgreSQL source tree, so it's a bit ugly ... ! # Lines commented out are for using mingw instead of MSVC.NET. ! win_pg_build_root = os.getenv("PG_SRC", "../postgresql") ! ! include_dirs = [os.path.join(win_pg_build_root, p) for p in ! ["src/include", ! "src/include/libpq", ! "src", ! "src/interfaces/libpq"]] ! ! #library_dirs = [win_pg_build_root + "/src/interfaces/libpq"] ! library_dirs = [win_pg_build_root + "/src/interfaces/libpq/Release"] #optional_libs += ["wsock32", "advapi32"] ! optional_libs = ["libpq", "wsock32", "advapi32", "shfolder"] modname="pyPgSQL.libpq.libpq" else: --- 141,148 ---- optional_libs += ["ssl", "crypto"] elif sys.platform == "win32": ! include_dirs = [os.popen("pg_config --includedir").read().strip()] ! library_dirs = [os.popen("pg_config --libdir").read().strip() + "/ms"] #optional_libs += ["wsock32", "advapi32"] ! optional_libs = ["libpq", "wsock32", "advapi32"] # , "shfolder"] modname="pyPgSQL.libpq.libpq" else: |