pywin32-checkins

[<th...@us...>]

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

Modified Files:
	setup_win32all_core.py 
Log Message:
The WinExt class now has a method to parse DSP files to get the source
files from them - this removes the long listing of source files, and
should make it more robust.


Index: setup_win32all_core.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all_core.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup_win32all_core.py	16 May 2003 18:46:46 -0000	1.3
--- setup_win32all_core.py	18 Jul 2003 08:36:13 -0000	1.4
***************
*** 11,20 ****
  
  class WinExt (Extension):
!     # Base class for all win32 extensions, with
!     # some predefined library and include dirs,
!     # and predefined windows libraries.
!     # Additionally a method to parse .def files
!     # into lists of exported symbols.
!     def __init__ (self, name, sources,
                    include_dirs=[],
                    define_macros=None,
--- 11,19 ----
  
  class WinExt (Extension):
!     # Base class for all win32 extensions, with some predefined
!     # library and include dirs, and predefined windows libraries.
!     # Additionally a method to parse .def files into lists of exported
!     # symbols, and to read 
!     def __init__ (self, name, sources=None,
                    include_dirs=[],
                    define_macros=None,
***************
*** 28,32 ****
--- 27,33 ----
                    export_symbols=None,
                    export_symbol_file=None,
+                   dsp_file=None,
                   ):
+         assert dsp_file or sources, "Either dsp_file or sources must be specified"
          libary_dirs = library_dirs,
          include_dirs = ['com/win32com/src/include',
***************
*** 34,40 ****
--- 35,47 ----
          libraries = ['user32', 'odbc32', 'advapi32',
                       'oleaut32', 'ole32', 'shell32'] + libraries
+ 
          if export_symbol_file:
              export_symbols = export_symbols or []
              export_symbols.extend(self.parse_def_file(export_symbol_file))
+ 
+         if dsp_file:
+             sources = sources or []
+             sources.extend(self.get_source_files(dsp_file))
+             
          Extension.__init__ (self, name, sources,
                              include_dirs,
***************
*** 61,154 ****
          return result
  
! pywintypes = WinExt('pywintypes',
!                        ['win32/src/PyACL.cpp',
!                         'win32/src/PyHandle.cpp',
!                         'win32/src/PyIID.cpp',
!                         'win32/src/PyLARGE_INTEGER.cpp',
!                         'win32/src/PyOVERLAPPED.cpp',
!                         'win32/src/PySECURITY_ATTRIBUTES.cpp',
!                         'win32/src/PySECURITY_DESCRIPTOR.cpp',
  
!                         'win32/src/PySID.cpp',
!                         'win32/src/PyTime.cpp',
!                         'win32/src/PyUnicode.cpp',
!                         'win32/src/PyWinTypesmodule.cpp',
!                         ],
!                        extra_compile_args = ['-DBUILD_PYWINTYPES']
!                        )
  
! # source directories for win32com
! com_src = 'com/win32com/src/'
! com_ext = 'com/win32com/src/extensions/'
  
  pythoncom = WinExt('pythoncom',
!                    [com_src + 'dllmain.cpp',
!                     com_src + 'ErrorUtils.cpp',
!                     com_src + 'MiscTypes.cpp',
!                     com_src + 'oleargs.cpp',
!                     com_src + 'PyComHelpers.cpp',
!                     com_src + 'PyFactory.cpp',
!                     com_src + 'PyGatewayBase.cpp',
!                     com_src + 'PyIBase.cpp',
!                     com_src + 'PyIClassFactory.cpp',
!                     com_src + 'PyIDispatch.cpp',
!                     com_src + 'PyIUnknown.cpp',
!                     com_src + 'PyRecord.cpp',
!                     com_src + 'PyStorage.cpp',
!                     com_src + 'PythonCOM.cpp',
!                     com_src + 'Register.cpp',
!                     com_src + 'stdafx.cpp',
!                     com_src + 'univgw.cpp',
!                     com_src + 'univgw_dataconv.cpp',
!                     
!                     com_ext + 'PyFUNCDESC.cpp',
!                     com_ext + 'PyGConnectionPoint.cpp',
!                     com_ext + 'PyGConnectionPointContainer.cpp',
!                     com_ext + 'PyGEnumVariant.cpp',
!                     com_ext + 'PyGErrorLog.cpp',
!                     com_ext + 'PyGPersist.cpp',
!                     com_ext + 'PyGPersistPropertyBag.cpp',
!                     com_ext + 'PyGPersistStorage.cpp',
!                     com_ext + 'PyGPersistStream.cpp',
!                     com_ext + 'PyGPersistStreamInit.cpp',
!                     com_ext + 'PyGPropertyBag.cpp',
!                     com_ext + 'PyGStream.cpp',
!                     com_ext + 'PyIBindCtx.cpp',
!                     com_ext + 'PyICatInformation.cpp',
!                     com_ext + 'PyICatRegister.cpp',
!                     com_ext + 'PyIConnectionPoint.cpp',
!                     com_ext + 'PyIConnectionPointContainer.cpp',
!                     com_ext + 'PyICreateTypeInfo.cpp',
!                     com_ext + 'PyICreateTypeLib.cpp',
!                     com_ext + 'PyIEnumCATEGORYINFO.cpp',
!                     com_ext + 'PyIEnumConnectionPoints.cpp',
!                     com_ext + 'PyIEnumConnections.cpp',
!                     com_ext + 'PyIEnumGUID.cpp',
!                     com_ext + 'PyIEnumSTATPROPSTG.cpp',
!                     com_ext + 'PyIEnumSTATSTG.cpp',
!                     com_ext + 'PyIEnumVariant.cpp',
!                     com_ext + 'PyIErrorLog.cpp',
!                     com_ext + 'PyIExternalConnection.cpp',
!                     com_ext + 'PyILockBytes.cpp',
!                     com_ext + 'PyIMoniker.cpp',
!                     com_ext + 'PyIPersist.cpp',
!                     com_ext + 'PyIPersistFile.cpp',
!                     com_ext + 'PyIPersistPropertyBag.cpp',
!                     com_ext + 'PyIPersistStorage.cpp',
!                     com_ext + 'PyIPersistStream.cpp',
!                     com_ext + 'PyIPersistStreamInit.cpp',
!                     com_ext + 'PyIPropertyBag.cpp',
!                     com_ext + 'PyIPropertySetStorage.cpp',
!                     com_ext + 'PyIPropertyStorage.cpp',
!                     com_ext + 'PyIprovideClassInfo.cpp',
!                     com_ext + 'PyIRunningObjectTable.cpp',
!                     com_ext + 'PyIServiceProvider.cpp',
!                     com_ext + 'PyIStorage.cpp',
!                     com_ext + 'PyIStream.cpp',
!                     com_ext + 'PyIType.cpp',
!                     com_ext + 'PyITypeObjects.cpp',
!                     com_ext + 'PyTYPEATTR.cpp',
!                     com_ext + 'PyVARDESC.cpp',
!                     ],
                     export_symbol_file = 'com/win32com/src/PythonCOM.def',
  ##                   libraries = ['PyWintypes'],
--- 68,91 ----
          return result
  
!     def get_source_files(self, dsp):
!         result = []
!         dsp_path = os.path.dirname(dsp)
!         for line in open(dsp, "r"):
!             fields = line.strip().split("=", 2)
!             if fields[0]=="SOURCE":
!                 if os.path.splitext(fields[1])[1].lower() in ['.cpp', '.c']:
!                     pathname = os.path.normpath(os.path.join(dsp_path, fields[1]))
!                     result.append(pathname)
!         return result
  
! ################################################################
  
! pywintypes = WinExt('pywintypes',
!                     dsp_file = r"win32\PyWinTypes.dsp",
!                     extra_compile_args = ['-DBUILD_PYWINTYPES']
!                     )
  
  pythoncom = WinExt('pythoncom',
!                    dsp_file=r"com\win32com.dsp",
                     export_symbol_file = 'com/win32com/src/PythonCOM.def',
  ##                   libraries = ['PyWintypes'],
***************
*** 158,162 ****
  
  class my_install_lib (install_lib):
! 
      def finalize_options(self):
          install_lib.finalize_options(self)
--- 95,100 ----
  
  class my_install_lib (install_lib):
!     # A special install_lib command, which will install into the windows
!     # system directory instead of Lib/site-packages
      def finalize_options(self):
          install_lib.finalize_options(self)