Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23988
Modified Files:
setup.py
Log Message:
* Add comments and Winresrc.h to the files we scan for version info.
* Add adodbapi
Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** setup.py 12 Feb 2008 00:10:57 -0000 1.68
--- setup.py 12 Feb 2008 12:54:19 -0000 1.69
***************
*** 668,673 ****
os.environ.get("INCLUDE", "").split(os.pathsep)
for d in include_dirs:
! # new platform SDKs stick the version in sdkddkver.h
! for header in ('WINDOWS.H', 'SDKDDKVER.H'):
look = os.path.join(d, header)
if os.path.isfile(look):
--- 668,676 ----
os.environ.get("INCLUDE", "").split(os.pathsep)
for d in include_dirs:
! # We look for _WIN32_WINNT instead of WINVER as the Vista
! # SDK defines _WIN32_WINNT as WINVER and we aren't that clever
! # * Windows Server 2003 SDK sticks this version in WinResrc.h
! # * Vista SDKs stick the version in sdkddkver.h
! for header in ('WINDOWS.H', 'SDKDDKVER.H', "WinResrc.h"):
look = os.path.join(d, header)
if os.path.isfile(look):
***************
*** 731,735 ****
if sys.hexversion < 0x2040000 and ext.name == 'axdebug' and self.debug:
return "axdebug doesn't build in VC6 debug builds (irony!)"
!
# We update the .libraries list with the resolved library name.
# This is really only so "_d" works.
--- 734,738 ----
if sys.hexversion < 0x2040000 and ext.name == 'axdebug' and self.debug:
return "axdebug doesn't build in VC6 debug builds (irony!)"
!
# We update the .libraries list with the resolved library name.
# This is really only so "_d" works.
***************
*** 1791,1794 ****
--- 1794,1798 ----
'pythonwin.pywin.tools',
'isapi',
+ 'adodbapi',
]
***************
*** 1893,1896 ****
--- 1897,1902 ----
'isapi/test/*.py',
'isapi/test/*.txt',
+ 'adodbapi/*.txt',
+ 'adodbapi/tests/*.py',
]) +
# The headers and .lib files
|
