[pywin32-checkins] pywin32 setup_win32all_core.py,1.17,1.18

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

Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1:/tmp/cvs-serv1164

Modified Files:
	setup_win32all_core.py 
Log Message:
Fix a few package paths, and a couple of extra PCH


Index: setup_win32all_core.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all_core.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** setup_win32all_core.py	11 Nov 2003 08:29:02 -0000	1.17
--- setup_win32all_core.py	11 Nov 2003 11:14:40 -0000	1.18
***************
*** 106,109 ****
--- 106,111 ----
          return "win32"
  
+ # Note this is used only for "win32com extensions", not pythoncom
+ # itself - thus, output is "win32comext"
  class WinExt_win32com(WinExt):
      def __init__ (self, name, **kw):
***************
*** 113,117 ****
          WinExt.__init__(self, name, **kw)
      def get_pywin32_dir(self):
!         return "win32com/" + self.name
  
  # 'win32com.mapi.exchange' and 'win32com.mapi.exchdapi' currently only
--- 115,119 ----
          WinExt.__init__(self, name, **kw)
      def get_pywin32_dir(self):
!         return "win32comext/" + self.name
  
  # 'win32com.mapi.exchange' and 'win32com.mapi.exchdapi' currently only
***************
*** 519,524 ****
  pythonwin_extensions = [
      WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
!                      pch_header = "stdafx.h"),
!     WinExt_pythonwin("win32uiole"),
      WinExt_pythonwin("dde", pch_header="stdafxdde.h"),
  ]
--- 521,526 ----
  pythonwin_extensions = [
      WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'],
!                      pch_header="stdafx.h"),
!     WinExt_pythonwin("win32uiole", pch_header="stdafxole.h"),
      WinExt_pythonwin("dde", pch_header="stdafxdde.h"),
  ]
***************
*** 548,555 ****
        ext_modules = win32_extensions + com_extensions + pythonwin_extensions,
  
!       package_dir = {"win32": "win32/lib",
                       "win32com": "com/win32com",
                       "win32comext": "com/win32comext",
!                      "Pythonwin": "Pythonwin/pywin"},
  
        packages=['win32',
--- 550,557 ----
        ext_modules = win32_extensions + com_extensions + pythonwin_extensions,
  
!       package_dir = {"win32": "win32",
                       "win32com": "com/win32com",
                       "win32comext": "com/win32comext",
!                      "Pythonwin": "Pythonwin"},
  
        packages=['win32',
***************
*** 577,591 ****
                  'win32comext.axscript.server',
  
                  'Pythonwin',
!                 'Pythonwin.debugger',
!                 'Pythonwin.dialogs',
!                 'Pythonwin.docking',
!                 'Pythonwin.framework',
!                 'Pythonwin.framework.editor',
!                 'Pythonwin.framework.editor.color',
!                 'Pythonwin.idle',
!                 'Pythonwin.mfc',
!                 'Pythonwin.scintilla',
!                 'Pythonwin.tools',
                  ],
        )
--- 579,599 ----
                  'win32comext.axscript.server',
  
+                 'win32comext.shell',
+                 'win32comext.mapi',
+                 'win32comext.internet',
+                 'win32comext.axcontrol',
+ 
                  'Pythonwin',
!                 'Pythonwin.pywin',
!                 'Pythonwin.pywin.debugger',
!                 'Pythonwin.pywin.dialogs',
!                 'Pythonwin.pywin.docking',
!                 'Pythonwin.pywin.framework',
!                 'Pythonwin.pywin.framework.editor',
!                 'Pythonwin.pywin.framework.editor.color',
!                 'Pythonwin.pywin.idle',
!                 'Pythonwin.pywin.mfc',
!                 'Pythonwin.pywin.scintilla',
!                 'Pythonwin.pywin.tools',
                  ],
        )