Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1:/tmp/cvs-serv5839
Modified Files:
setup_win32all.py
Log Message:
Patches from Thomas, and local fix for exchange/exchdapi
Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup_win32all.py 1 Dec 2003 10:47:59 -0000 1.1
--- setup_win32all.py 2 Dec 2003 12:33:25 -0000 1.2
***************
*** 52,55 ****
--- 52,60 ----
False=1==0
+ try:
+ this_file = __file__
+ except NameError:
+ this_file = sys.argv[0]
+
class WinExt (Extension):
# Base class for all win32 extensions, with some predefined
***************
*** 120,123 ****
--- 125,139 ----
pathname = os.path.normpath(os.path.join(dsp_path, fields[1]))
result.append(pathname)
+
+ # Sort the sources so that (for example) the .mc file is processed first,
+ # building this may create files included by other source files.
+ # Note that this requires a patch to distutils' ccompiler classes so that
+ # they build the sources in the order given.
+ build_order = ".i .mc .rc .cpp".split()
+ decorated = [(build_order.index(os.path.splitext(fname)[-1].lower()), fname)
+ for fname in result]
+ decorated.sort()
+ result = [item[1] for item in decorated]
+
return result
***************
*** 643,646 ****
--- 659,665 ----
'PyIProfAdmin': '',
'PyIProfSect': 'IMAPIProp',
+ # exchange and exchdapi
+ 'exchange': None,
+ 'exchdapi': None,
# ADSI
'adsi': None, # module
***************
*** 694,698 ****
ret.append( (path_use, files_use))
return ret
!
################################################################
--- 713,729 ----
ret.append( (path_use, files_use))
return ret
!
! def convert_optional_data_files(files):
! ret = []
! for file in files:
! try:
! temp = convert_data_files([file])
! except RuntimeError, details:
! if not str(details).startswith("No file"):
! raise
! print 'NOTE: Optional file %s not found - skipping' % file
! else:
! ret.append(temp[0])
! return ret
################################################################
***************
*** 756,761 ****
py_modules = expand_modules("win32\\lib"),
! data_files=convert_data_files([
! 'pywin32.chm',
'pythonwin/pywin/*.cfg',
'pythonwin/license.txt',
--- 787,794 ----
py_modules = expand_modules("win32\\lib"),
! data_files=convert_optional_data_files([
! 'PyWin32.chm',
! ]) +
! convert_data_files([
'pythonwin/pywin/*.cfg',
'pythonwin/license.txt',
***************
*** 777,781 ****
'com/win32comext/axscript/demos/client/wsh/*',
'com/win32comext/axscript/demos/client/asp/*',
! ]) + \
# And data files convert_data_files can't handle.
[
--- 810,814 ----
'com/win32comext/axscript/demos/client/wsh/*',
'com/win32comext/axscript/demos/client/asp/*',
! ]) +
# And data files convert_data_files can't handle.
[
|
