[pywin32-checkins] pywin32 setup.py,1.8,1.9

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

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

Modified Files:
	setup.py 
Log Message:
New files in adsi project, and move this to explicit specification of
'sources' while at it.  A few other minor fixups of recent 'source' changes.


Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** setup.py	24 May 2005 13:55:28 -0000	1.8
--- setup.py	26 May 2005 11:41:03 -0000	1.9
***************
*** 182,191 ****
          decorated.sort()
          result = [item[1] for item in decorated]
- 
          return result
  
  class WinExt_pythonwin(WinExt):
      def __init__ (self, name, **kw):
!         if not kw.has_key("dsp_file"):
              kw["dsp_file"] = "pythonwin/" + name + ".dsp"
          kw.setdefault("extra_compile_args", []).extend(
--- 182,190 ----
          decorated.sort()
          result = [item[1] for item in decorated]
          return result
  
  class WinExt_pythonwin(WinExt):
      def __init__ (self, name, **kw):
!         if not kw.has_key("dsp_file") and not kw.get("sources"):
              kw["dsp_file"] = "pythonwin/" + name + ".dsp"
          kw.setdefault("extra_compile_args", []).extend(
***************
*** 211,215 ****
  class WinExt_win32com(WinExt):
      def __init__ (self, name, **kw):
!         if not kw.has_key("dsp_file"):
              kw["dsp_file"] = "com/" + name + ".dsp"
          kw["libraries"] = kw.get("libraries", "") + " oleaut32 ole32"
--- 210,214 ----
  class WinExt_win32com(WinExt):
      def __init__ (self, name, **kw):
!         if not kw.has_key("dsp_file") and not kw.get("sources"):
              kw["dsp_file"] = "com/" + name + ".dsp"
          kw["libraries"] = kw.get("libraries", "") + " oleaut32 ole32"
***************
*** 865,868 ****
--- 864,871 ----
  win32_extensions += [
      WinExt_win32("win32gui", 
+            sources = """
+                 win32/src/win32dynamicdialog.cpp
+                 win32/src/win32gui.i win32/src/win32guimodule.cpp
+                """.split(),
             libraries="gdi32 user32 comdlg32 comctl32 shell32",
             define_macros = [("WIN32GUI", None)],
***************
*** 871,876 ****
      # including windows.h.  It also has an XP style manifest.
      WinExt_win32("winxpgui",
!            sources = ["win32/src/winxpgui.rc"],
!            dsp_file = "win32/win32gui.dsp",
             libraries="gdi32 user32 comdlg32 comctl32 shell32",
             define_macros = [("WIN32GUI",None), ("WINXPGUI",None)],
--- 874,881 ----
      # including windows.h.  It also has an XP style manifest.
      WinExt_win32("winxpgui",
!            sources = """
!                 win32/src/winxpgui.rc win32/src/win32dynamicdialog.cpp
!                 win32/src/win32gui.i win32/src/win32guimodule.cpp
!                """.split(),
             libraries="gdi32 user32 comdlg32 comctl32 shell32",
             define_macros = [("WIN32GUI",None), ("WINXPGUI",None)],
***************
*** 880,884 ****
      WinExt_win32("_winxptheme",
             sources = ["win32/src/_winxptheme.i", "win32/src/_winxpthememodule.cpp"],
-            dsp_file = None,
             libraries="gdi32 user32 comdlg32 comctl32 shell32 Uxtheme",
             windows_h_version=0x0500,
--- 885,888 ----
***************
*** 893,896 ****
--- 897,904 ----
  ]
  
+ dirs = {
+     'adsi' : 'com/win32comext/adsi/src',
+ }
+ 
  # The COM modules.
  pythoncom = WinExt_system32('pythoncom',
***************
*** 904,908 ****
  com_extensions = [pythoncom]
  com_extensions += [
!     WinExt_win32com('adsi', libraries="ACTIVEDS ADSIID"),
      WinExt_win32com('axcontrol', pch_header="axcontrol_pch.h"),
      WinExt_win32com('axscript',
--- 912,927 ----
  com_extensions = [pythoncom]
  com_extensions += [
!     WinExt_win32com('adsi', libraries="ACTIVEDS ADSIID",
!                     sources=("""
!                         %(adsi)s/adsi.i                 %(adsi)s/adsi.cpp
!                         %(adsi)s/PyIADsContainer.i      %(adsi)s/PyIADsContainer.cpp
!                         %(adsi)s/PyIADsUser.i           %(adsi)s/PyIADsUser.cpp
!                         %(adsi)s/PyIDirectoryObject.i   %(adsi)s/PyIDirectoryObject.cpp
!                         %(adsi)s/PyIDirectorySearch.i   %(adsi)s/PyIDirectorySearch.cpp
!                         %(adsi)s/PyIDsObjectPicker.i    %(adsi)s/PyIDsObjectPicker.cpp
! 
!                         %(adsi)s/adsilib.i
!                         %(adsi)s/PyADSIUtil.cpp         %(adsi)s/PyDSOPObjects.cpp 
!                         """ % dirs).split()),
      WinExt_win32com('axcontrol', pch_header="axcontrol_pch.h"),
      WinExt_win32com('axscript',
***************
*** 997,1000 ****
--- 1016,1020 ----
      'PyIDirectoryObject':   '',
      'PyIDirectorySearch':   '',
+     'PyIDsObjectPicker':   '',
  }