Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25935
Modified Files:
setup_win32all.py
Log Message:
* New feature of copying .lib files didn't handle _d correctly.
* axdebug struggles under release builds for vc6
* adsi gets a new swig file.
Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** setup_win32all.py 20 Sep 2004 02:54:39 -0000 1.33
--- setup_win32all.py 24 Sep 2004 07:26:37 -0000 1.34
***************
*** 350,353 ****
--- 350,357 ----
self.found_libraries[lib.lower()] = found
patched_libs.append(os.path.splitext(os.path.basename(found))[0])
+ # axdebug struggles under debug builds - worry about that when I care :)
+ 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.
***************
*** 421,432 ****
# Copy cpp lib files needed to create Python COM extensions
! clib_files = (['win32', 'pywintypes.lib'],
! ['win32com', 'pythoncom.lib'])
for clib_file in clib_files:
target_dir = os.path.join(self.build_lib, clib_file[0], "libs")
if not os.path.exists(target_dir):
self.mkpath(target_dir)
self.copy_file(
! os.path.join(self.build_temp, clib_file[1]), target_dir)
def build_exefile(self, ext):
--- 425,440 ----
# Copy cpp lib files needed to create Python COM extensions
! clib_files = (['win32', 'pywintypes%s.lib'],
! ['win32com', 'pythoncom%s.lib'])
for clib_file in clib_files:
target_dir = os.path.join(self.build_lib, clib_file[0], "libs")
if not os.path.exists(target_dir):
self.mkpath(target_dir)
+ suffix = ""
+ if self.debug:
+ suffix = "_d"
+ fname = clib_file[1] % suffix
self.copy_file(
! os.path.join(self.build_temp, fname), target_dir)
def build_exefile(self, ext):
***************
*** 946,949 ****
--- 954,958 ----
'PyIADsUser': 'IDispatch',
'PyIDirectoryObject': '',
+ 'PyIDirectorySearch': '',
}
|
