psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2024-11-26 10:53:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

mx_include_dir in setup.cfg.

Browse Source
This commit is contained in:
Federico Di Gregorio 2005-12-11 08:05:49 +00:00
parent 61de8690e9
commit 31d85750b0
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-12-11 Federico Di Gregorio <fog@initd.org> 2005-12-11 Federico Di Gregorio <fog@initd.org>
* setup.py: half-applied patch from Tavis to specify mx_include_dir
in setup.cfg.
* psycopg/typecast.c (typecast_parse_time): cz limit in the while * psycopg/typecast.c (typecast_parse_time): cz limit in the while
loop is 6, not 5. This solve the problem with "fractionary" time zones loop is 6, not 5. This solve the problem with "fractionary" time zones
and fixes #78. and fixes #78.

4
setup.cfg
View File

@ -16,6 +16,10 @@ use_pydatetime=1
# with old versions of psycopg 1 and pre-beta versions of psycopg 2.) # with old versions of psycopg 1 and pre-beta versions of psycopg 2.)
use_decimal=0 use_decimal=0
# If the build system does not find the mx.DateTime headers, try
# uncommenting the following line and setting its value to the right path.
#mx_include_dir=
# "include_dirs" is the preferred method for locating postgresql headers, # "include_dirs" is the preferred method for locating postgresql headers,
# but some extra checks on sys.platform will still be done in setup.py. # but some extra checks on sys.platform will still be done in setup.py.
# The next line is the default as used on psycopg author Debian laptop: # The next line is the default as used on psycopg author Debian laptop:

11
setup.py
View File

@ -77,13 +77,11 @@ class psycopg_build_ext(build_ext):
user_options = build_ext.user_options[:] user_options = build_ext.user_options[:]
user_options.extend([ user_options.extend([
('pgdir=', None, ('pgdir=', None,
"The postgresql directory, either source or bin"), "The postgresql directory, either source or bin (win32 only)"),
('use-pg-dll', None, ('use-pg-dll', None,
"Build against libpq.dll"), "Build against libpq.dll (win32 only)"),
('use-pydatetime', None, ('use-pydatetime', None,
"Use Python datatime objects for date and time representation."), "Use Python datatime objects for date and time representation."),
('use-decimal', None,
"Use Decimal type even on Python 2.3 if the module is provided."),
]) ])
boolean_options = build_ext.boolean_options[:] boolean_options = build_ext.boolean_options[:]
@ -282,7 +280,10 @@ have_mxdatetime = False
use_pydatetime = int(parser.get('build_ext', 'use_pydatetime')) use_pydatetime = int(parser.get('build_ext', 'use_pydatetime'))
# check for mx package # check for mx package
mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx") if parser.has_option('build_ext', 'mx_include_dir'):
mxincludedir = parser.get('build_ext', 'mx_include_dir')
else:
mxincludedir = os.path.join(get_python_inc(plat_specific=1), "mx")
if os.path.exists(mxincludedir): if os.path.exists(mxincludedir):
include_dirs.append(mxincludedir) include_dirs.append(mxincludedir)
define_macros.append(('HAVE_MXDATETIME','1')) define_macros.append(('HAVE_MXDATETIME','1'))