[pywin32-checkins] pywin32 setup.py,1.81.2.13,1.81.2.14

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

Update of /cvsroot/pywin32/pywin32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4460

Modified Files:
      Tag: py3k
	setup.py 
Log Message:
merge lots of changes from the trunk

Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.81.2.13
retrieving revision 1.81.2.14
diff -C2 -d -r1.81.2.13 -r1.81.2.14
*** setup.py	5 Jan 2009 12:51:26 -0000	1.81.2.13
--- setup.py	14 Jan 2009 12:42:02 -0000	1.81.2.14
***************
*** 29,35 ****
  The 'exchange' extensions require headers that are no longer in any current
  SDKs, so these fail to build, but the 'mapi' extension should still build.
! Also, 'axdebug' once worked with recent Platform SDKs, with no
! additional software was needed - but currently this extension is known to not
! build.
  
  Building:
--- 29,45 ----
  The 'exchange' extensions require headers that are no longer in any current
  SDKs, so these fail to build, but the 'mapi' extension should still build.
! 
! To build the axdebug extension for 32bit Python, follow these instructions:
! 
! * Download the "Internet Explorer 4.01 Refresh of the Internet Client SDK"
!   from http://support.microsoft.com/kb/q177877/.
! * The download is a self-extracting archive - execute it and unzip the
!   contents to a 'temp' directory.
! * From that directory, copy 'include/axdebug.h' and 'lib/msdbg.lib' to
!   somewhere the build process will find them - the 'include' and 'lib'
!   directories of your SDK installation works.
! 
! Note that no equivalent SDK for 64bit operating systems appears available,
! so this extension does not build on 64bit versions.
  
  Building:
***************
*** 879,883 ****
          # 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")
--- 889,894 ----
          # Copy cpp lib files needed to create Python COM extensions
          clib_files = (['win32', 'pywintypes%s.lib'],
!                       ['win32com', 'pythoncom%s.lib'],
!                       ['axscript', 'axscript%s.lib'])
          for clib_file in clib_files:
              target_dir = os.path.join(self.build_lib, clib_file[0], "libs")
***************
*** 1544,1547 ****
--- 1555,1559 ----
      'shell' : 'com/win32comext/shell/src',
      'axcontrol' : 'com/win32comext/axcontrol/src',
+     'axdebug' : 'com/win32comext/axdebug/src',
      'mapi' : 'com/win32comext/mapi/src',
      'authorization' : 'com/win32comext/authorization/src',
***************
*** 1593,1596 ****
--- 1605,1609 ----
              dsp_file=r"com\Active Scripting.dsp",
              extra_compile_args = ['-DPY_BUILD_AXSCRIPT'],
+             implib_name="axscript.lib",
              pch_header = "stdafx.h"
      ),
***************
*** 1598,1605 ****
      # module for details on getting it built.
      WinExt_win32com('axdebug',
!             dsp_file=r"com\Active Debugging.dsp",
!             libraries="axscript",
!             pch_header = "stdafx.h",
!             optional_headers = ["activdbg.h"],
      ),
      WinExt_win32com('internet'),
--- 1611,1664 ----
      # module for details on getting it built.
      WinExt_win32com('axdebug',
!             libraries="axscript msdbg",
!             pch_header="stdafx.h",
!             optional_headers=["activdbg.h"],
!             platforms=['win32'],
!             sources=("""
!                     %(axdebug)s/AXDebug.cpp
!                     %(axdebug)s/PyIActiveScriptDebug.cpp
!                     %(axdebug)s/PyIActiveScriptErrorDebug.cpp
!                     %(axdebug)s/PyIActiveScriptSiteDebug.cpp
!                     %(axdebug)s/PyIApplicationDebugger.cpp
!                     %(axdebug)s/PyIDebugApplication.cpp
!                     %(axdebug)s/PyIDebugApplicationNode.cpp
!                     %(axdebug)s/PyIDebugApplicationNodeEvents.cpp
!                     %(axdebug)s/PyIDebugApplicationThread.cpp
!                     %(axdebug)s/PyIDebugCodeContext.cpp
!                     %(axdebug)s/PyIDebugDocument.cpp
!                     %(axdebug)s/PyIDebugDocumentContext.cpp
!                     %(axdebug)s/PyIDebugDocumentHelper.cpp
!                     %(axdebug)s/PyIDebugDocumentHost.cpp
!                     %(axdebug)s/PyIDebugDocumentInfo.cpp
!                     %(axdebug)s/PyIDebugDocumentProvider.cpp
!                     %(axdebug)s/PyIDebugDocumentText.cpp
!                     %(axdebug)s/PyIDebugDocumentTextAuthor.cpp
!                     %(axdebug)s/PyIDebugDocumentTextEvents.cpp
!                     %(axdebug)s/PyIDebugDocumentTextExternalAuthor.cpp
!                     %(axdebug)s/PyIDebugExpression.cpp
!                     %(axdebug)s/PyIDebugExpressionCallBack.cpp
!                     %(axdebug)s/PyIDebugExpressionContext.cpp
!                     %(axdebug)s/PyIDebugProperties.cpp
!                     %(axdebug)s/PyIDebugSessionProvider.cpp
!                     %(axdebug)s/PyIDebugStackFrame.cpp
!                     %(axdebug)s/PyIDebugStackFrameSniffer.cpp
!                     %(axdebug)s/PyIDebugStackFrameSnifferEx.cpp
!                     %(axdebug)s/PyIDebugSyncOperation.cpp
!                     %(axdebug)s/PyIEnumDebugApplicationNodes.cpp
!                     %(axdebug)s/PyIEnumDebugCodeContexts.cpp
!                     %(axdebug)s/PyIEnumDebugExpressionContexts.cpp
!                     %(axdebug)s/PyIEnumDebugPropertyInfo.cpp
!                     %(axdebug)s/PyIEnumDebugStackFrames.cpp
!                     %(axdebug)s/PyIEnumRemoteDebugApplications.cpp
!                     %(axdebug)s/PyIEnumRemoteDebugApplicationThreads.cpp
!                     %(axdebug)s/PyIMachineDebugManager.cpp
!                     %(axdebug)s/PyIMachineDebugManagerEvents.cpp
!                     %(axdebug)s/PyIProcessDebugManager.cpp
!                     %(axdebug)s/PyIProvideExpressionContexts.cpp
!                     %(axdebug)s/PyIRemoteDebugApplication.cpp
!                     %(axdebug)s/PyIRemoteDebugApplicationEvents.cpp
!                     %(axdebug)s/PyIRemoteDebugApplicationThread.cpp
!                     %(axdebug)s/stdafx.cpp
!                      """ % dirs).split(),
      ),
      WinExt_win32com('internet'),
***************
*** 1907,1910 ****
--- 1966,1970 ----
            'win32comext.taskscheduler',
            'win32comext.directsound',
+           'win32comext.directsound.test',
            'win32comext.authorization',
            'win32comext.bits',