[pywin32-checkins] pywin32 setup.py,1.5,1.6

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

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

Modified Files:
	setup.py 
Log Message:
Insist on the Exchange 2000 SDK in order to build the exchange and mapi
modules - ie, drop support for the VC6 MAPI 
libraries.  This works with both VC6 and 7 and makes life simpler.


Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** setup.py	25 Jan 2005 04:16:49 -0000	1.5
--- setup.py	7 Mar 2005 01:19:06 -0000	1.6
***************
*** 19,23 ****
  warnings; if you do use them, you must install the correct libraries.
  
! The 'axdebug' extension requires Active Debugging dev files available here:
    http://support.microsoft.com/default.aspx?kbid=223389
  Download Scriptng.exe, unpack the files to a temporary directory and manually
--- 19,28 ----
  warnings; if you do use them, you must install the correct libraries.
  
! The 'mapi' and 'exchange' extensions require the Exchange 2000 SDK from:
!   http://www.microsoft.com/downloads/details.aspx?FamilyID={guid}
!     where guid is 4afe3504-c209-4a73-ac5d-ff2a4a3b48b7
! Just install it - this setup script will automatically locate it.
! 
! The 'axdebug' extension requires Active Debugging dev files available from:
    http://support.microsoft.com/default.aspx?kbid=223389
  Download Scriptng.exe, unpack the files to a temporary directory and manually
***************
*** 27,34 ****
  To install the pywin32 extensions, execute:
    python setup.py -q install
!   
  This will install the built extensions into your site-packages directory,
  create an appropriate .pth file, and should leave everything ready to use.
! There should be no need to modify the registry.
  
  To build or install debug (_d) versions of these extensions, ensure you have
--- 32,39 ----
  To install the pywin32 extensions, execute:
    python setup.py -q install
! 
  This will install the built extensions into your site-packages directory,
  create an appropriate .pth file, and should leave everything ready to use.
! There is no need to modify the registry.
  
  To build or install debug (_d) versions of these extensions, ensure you have
***************
*** 220,223 ****
--- 225,229 ----
  # * Look for the Exchange SDK in the registry.
  # * Output directory is different than the module's basename.
+ # * Require use of the Exchange 2000 SDK - this works for both VC6 and 7
  class WinExt_win32com_mapi(WinExt_win32com):
      def __init__ (self, name, **kw):
***************
*** 244,253 ****
              if os.path.isdir(d):
                  kw.setdefault("library_dirs", []).insert(0, d)
!             # The stand-alone exchange SDK has these libs
!             libs += " Ex2KSdk sadapi mapi32 netapi32"
!         else:
!             # The MSVC6 included exchange SDK has these libs
!             libs += """ MBLOGON ADDRLKUP mapi32 exchinst
!                        EDKCFG EDKUTILS EDKMAPI ACLCLS"""
          kw["libraries"] = libs
          WinExt_win32com.__init__(self, name, **kw)
--- 250,256 ----
              if os.path.isdir(d):
                  kw.setdefault("library_dirs", []).insert(0, d)
!                 
!         # The stand-alone exchange SDK has these libs
!         libs += " Ex2KSdk sadapi mapi32 netapi32"
          kw["libraries"] = libs
          WinExt_win32com.__init__(self, name, **kw)
***************
*** 908,919 ****
      WinExt_win32com('internet'),
      WinExt_win32com('mapi', libraries="mapi32", pch_header="PythonCOM.h"),
!     WinExt_win32com_mapi('exchange',
!                          libraries="""version""",
!                          extra_link_args=["/nodefaultlib:libc"]),
!     WinExt_win32com_mapi('exchdapi',
!                          # This still needs work for vs.net.
!                          libraries="""DAPI ADDRLKUP exchinst EDKCFG EDKUTILS
!                                       EDKMAPI mapi32 version""",
!                          extra_link_args=["/nodefaultlib:libc"]),
      WinExt_win32com('shell', libraries='shell32', pch_header="shell_pch.h"),
      WinExt_win32com('taskscheduler', libraries='mstask'),
--- 911,916 ----
      WinExt_win32com('internet'),
      WinExt_win32com('mapi', libraries="mapi32", pch_header="PythonCOM.h"),
!     WinExt_win32com_mapi('exchange', libraries="version"),
!     WinExt_win32com_mapi('exchdapi'),
      WinExt_win32com('shell', libraries='shell32', pch_header="shell_pch.h"),
      WinExt_win32com('taskscheduler', libraries='mstask'),