[pywin32-checkins] pywin32 setup_win32all.py,1.27,1.28

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22965

Modified Files:
	setup_win32all.py 
Log Message:
* Fix SDK lib dir handling.
* Work around problem in distutils where the build order of dependents 
  can't be defined - we need our .mc files processed before .cpp; the
  .mc generation process creates a .h


Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** setup_win32all.py	15 Aug 2004 04:25:37 -0000	1.27
--- setup_win32all.py	4 Sep 2004 03:06:29 -0000	1.28
***************
*** 275,279 ****
              if extra not in self.include_dirs and os.path.isdir(extra):
                  self.include_dirs.insert(0, extra)
!             extra = os.path.join(sys.exec_prefix, 'lib')
              if extra not in self.library_dirs and os.path.isdir(extra):
                  self.library_dirs.insert(0, extra)
--- 275,279 ----
              if extra not in self.include_dirs and os.path.isdir(extra):
                  self.include_dirs.insert(0, extra)
!             extra = os.path.join(sdk_dir, 'lib')
              if extra not in self.library_dirs and os.path.isdir(extra):
                  self.library_dirs.insert(0, extra)
***************
*** 717,733 ****
          macros, objects, extra, pp_opts, build = \
                 msvccompiler.MSVCCompiler._setup_compile(self, *args)
!         build_order = ".i .mc .rc .cpp".split()
!         decorated = [(build_order.index(ext.lower()), obj, (src, ext))
!                      for obj, (src, ext) in build.items()]
!         decorated.sort()
!         items = [item[1:] for item in decorated]
!         # The compiler itself only calls ".items" - leverage that, so that
!         # when it does, the list is in the correct order.
!         class OnlyItems:
!             def __init__(self, items):
!                 self._items = items
!             def items(self):
!                 return self._items
!         build = OnlyItems(items)
          return macros, objects, extra, pp_opts, build
          
--- 717,734 ----
          macros, objects, extra, pp_opts, build = \
                 msvccompiler.MSVCCompiler._setup_compile(self, *args)
!         if sys.hexversion < 0x02040000:
!             build_order = ".i .mc .rc .cpp".split()
!             decorated = [(build_order.index(ext.lower()), obj, (src, ext))
!                          for obj, (src, ext) in build.items()]
!             decorated.sort()
!             items = [item[1:] for item in decorated]
!             # The compiler itself only calls ".items" - leverage that, so that
!             # when it does, the list is in the correct order.
!             class OnlyItems:
!                 def __init__(self, items):
!                     self._items = items
!                 def items(self):
!                     return self._items
!             build = OnlyItems(items)
          return macros, objects, extra, pp_opts, build
          
***************
*** 1078,1081 ****
--- 1079,1083 ----
                  'com/win32comext/axscript/test/*',
                  'com/win32comext/axscript/Demos/*',
+                 'com/win32comext/mapi/demos/*.py',
                  'com/win32comext/shell/test/*.py',
                  'com/win32comext/shell/demos/servers/*.py',