mirror of
https://github.com/psycopg/psycopg2.git
synced 2024-11-29 20:23:45 +03:00
Merge branch 'outputres'
This commit is contained in:
commit
66f85b5832
6
NEWS
6
NEWS
|
@ -1,6 +1,12 @@
|
||||||
Current release
|
Current release
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
What's new in psycopg 2.5.3
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
- Fixed debug build on Windows, thanks to James Emerton.
|
||||||
|
|
||||||
|
|
||||||
What's new in psycopg 2.5.2
|
What's new in psycopg 2.5.2
|
||||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
|
9
setup.py
9
setup.py
|
@ -293,12 +293,15 @@ class psycopg_build_ext(build_ext):
|
||||||
manifest = '_psycopg.vc9.x86.manifest'
|
manifest = '_psycopg.vc9.x86.manifest'
|
||||||
if platform == 'win-amd64':
|
if platform == 'win-amd64':
|
||||||
manifest = '_psycopg.vc9.amd64.manifest'
|
manifest = '_psycopg.vc9.amd64.manifest'
|
||||||
|
try:
|
||||||
|
ext_path = self.get_ext_fullpath(extension.name)
|
||||||
|
except AttributeError:
|
||||||
|
ext_path = os.path.join(self.build_lib,
|
||||||
|
'psycopg2', '_psycopg.pyd')
|
||||||
self.compiler.spawn(
|
self.compiler.spawn(
|
||||||
['mt.exe', '-nologo', '-manifest',
|
['mt.exe', '-nologo', '-manifest',
|
||||||
os.path.join('psycopg', manifest),
|
os.path.join('psycopg', manifest),
|
||||||
'-outputresource:%s;2' % (
|
'-outputresource:%s;2' % ext_path])
|
||||||
os.path.join(self.build_lib,
|
|
||||||
'psycopg2', '_psycopg.pyd'))])
|
|
||||||
|
|
||||||
def finalize_win32(self):
|
def finalize_win32(self):
|
||||||
"""Finalize build system configuration on win32 platform."""
|
"""Finalize build system configuration on win32 platform."""
|
||||||
|
|
Loading…
Reference in New Issue
Block a user