[pywin32-checkins] pywin32 setup_win32all.py,1.34,1.35 MANIFEST.in,1.3,1.4

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

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

Modified Files:
	setup_win32all.py MANIFEST.in 
Log Message:
bump build to 203, integrate isapi with the build process and add lots of
missing demos etc from the source distro.


Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/pywin32/pywin32/MANIFEST.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MANIFEST.in	6 May 2004 03:41:27 -0000	1.3
--- MANIFEST.in	6 Oct 2004 05:13:00 -0000	1.4
***************
*** 12,15 ****
--- 12,16 ----
  include win32/Demos/*.py
  include win32/src/*.h
+ include win32/src/*.manifest
  include win32/src/PerfMon/perfmondata.def
  include win32/src/dbi.def
***************
*** 41,51 ****
--- 42,58 ----
  include com/win32comext/axdebug/src/*.h
  include com/win32comext/adsi/src/*.h
+ include com/win32comext/adsi/demos/*.py
  include com/win32comext/axcontrol/src/*.h
  include com/win32comext/internet/src/*.h
  include com/win32comext/mapi/src/*.h
  include com/win32comext/shell/src/*.h
+ include com/win32comext/mapi/demos/*.py
  include com/win32comext/shell/demos/servers/*.py
  include com/win32comext/shell/demos/*.py
+ include com/win32comext/shell/test/*.py
  include com/win32comext/taskscheduler/src/*.h
+ include com/win32comext/taskscheduler/test/*.py
+ include com/win32comext/ifilter/src/*.h
+ include com/win32comext/ifilter/demo/*.py
  
  # Pythonwin
***************
*** 60,63 ****
--- 67,75 ----
  include pythonwin/res/*.BMP
  include pythonwin/pywin/*.cfg
+ include pythonwin/pywin/Demos/*.py
+ include pythonwin/pywin/Demos/*.txt
+ include pythonwin/pywin/Demos/app/*.py
+ include pythonwin/pywin/Demos/app/*.txt
+ include pythonwin/pywin/Demos/ocx/*.py
  include pythonwin/License.txt
  # scintilla
***************
*** 75,78 ****
--- 87,100 ----
  include pythonwin/Scintilla/win32/*.cur
  
+ # ISAPI
+ include isapi/doc/*.html
+ include isapi/*.txt
+ include isapi/samples/*.py
+ include isapi/samples/*.txt
+ include isapi/test/*.py
+ include isapi/test/*.txt
+ 
+ include isapi/src/*.h
+ 
  # Other tools
  include SWIG/swig.exe

Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** setup_win32all.py	24 Sep 2004 07:26:37 -0000	1.34
--- setup_win32all.py	6 Oct 2004 05:12:53 -0000	1.35
***************
*** 1,3 ****
! build_number=202
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
--- 1,3 ----
! build_number=203
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
***************
*** 109,112 ****
--- 109,113 ----
                    windows_h_version=None, # min version of windows.h needed.
                    extra_swig_commands=None,
+                   is_regular_dll=False, # regular Windows DLL?
                    # list of headers which may not be installed forcing us to
                    # skip this extension
***************
*** 136,139 ****
--- 137,141 ----
          self.windows_h_version = windows_h_version
          self.optional_headers = optional_headers
+         self.is_regular_dll = is_regular_dll
          Extension.__init__ (self, name, sources,
                              include_dirs,
***************
*** 200,203 ****
--- 202,209 ----
          return "win32"
  
+ class WinExt_ISAPI(WinExt):
+     def get_pywin32_dir(self):
+         return "isapi"
+ 
  # Note this is used only for "win32com extensions", not pythoncom
  # itself - thus, output is "win32comext"
***************
*** 632,639 ****
              extra = self.debug and "_d.exe" or ".exe"
              return r"pythonwin\Pythonwin" + extra
          return build_ext.get_ext_filename(self, name)
  
      def get_export_symbols(self, ext):
!         if ext.name.endswith("perfmondata"):
              return ext.export_symbols
          return build_ext.get_export_symbols(self, ext)
--- 638,648 ----
              extra = self.debug and "_d.exe" or ".exe"
              return r"pythonwin\Pythonwin" + extra
+         elif name.endswith("isapi.PyISAPI_loader"):
+             extra = self.debug and "_d.dll" or ".dll"
+             return r"isapi\PyISAPI_loader" + extra
          return build_ext.get_ext_filename(self, name)
  
      def get_export_symbols(self, ext):
!         if ext.is_regular_dll:
              return ext.export_symbols
          return build_ext.get_export_symbols(self, ext)
***************
*** 716,720 ****
              # build for any platform sees these as dirty.
              # This could probably go once we generate .cpp into the temp dir.
!             if newer(os.path.abspath(source), os.path.abspath(target)):
                  swig_cmd.extend(["-o",
                                   os.path.abspath(target),
--- 725,729 ----
              # build for any platform sees these as dirty.
              # This could probably go once we generate .cpp into the temp dir.
!             if self.force or newer(os.path.abspath(source), os.path.abspath(target)):
                  swig_cmd.extend(["-o",
                                   os.path.abspath(target),
***************
*** 798,801 ****
--- 807,811 ----
                   extra_compile_args=["-DUNICODE", "-D_UNICODE", "-DWINNT"],
                   export_symbol_file = "win32/src/PerfMon/perfmondata.def",
+                  is_regular_dll = 1,
          ),
      )
***************
*** 863,867 ****
             libraries = "user32 ole32 advapi32 shell32",
             dsp_file = r"win32\Pythonservice servicemanager.dsp",
!            windows_h_version = 0x500)
  ]
  
--- 873,877 ----
             libraries = "user32 ole32 advapi32 shell32",
             dsp_file = r"win32\Pythonservice servicemanager.dsp",
!            windows_h_version = 0x500),
  ]
  
***************
*** 915,918 ****
--- 925,944 ----
  ]
  
+ other_extensions = [
+     WinExt_ISAPI('PyISAPI_loader',
+            sources=[os.path.join("isapi", "src", s) for s in
+                    """PyExtensionObjects.cpp PyFilterObjects.cpp
+                       pyISAPI.cpp PythonEng.cpp StdAfx.cpp
+                       Utils.cpp
+                    """.split()],
+            pch_header = "StdAfx.h",
+            is_regular_dll = 1,
+            export_symbols = """HttpExtensionProc GetExtensionVersion
+                                TerminateExtension GetFilterVersion
+                                HttpFilterProc TerminateFilter
+                                PyISAPISetOptions""".split(),
+            ),
+ ]
+ 
  W32_exe_files = [
      WinExt_win32("win32popenWin9x",
***************
*** 1056,1059 ****
--- 1082,1086 ----
            'pythonwin.pywin.scintilla',
            'pythonwin.pywin.tools',
+           'isapi',
            ]
  
***************
*** 1090,1098 ****
        scripts = ["pywin32_postinstall.py"],
  
!       ext_modules = win32_extensions + com_extensions + pythonwin_extensions,
  
        package_dir = {"win32com": "com/win32com",
                       "win32comext": "com/win32comext",
!                      "pythonwin": "pythonwin"},
        packages = packages,
        py_modules = py_modules,
--- 1117,1126 ----
        scripts = ["pywin32_postinstall.py"],
  
!       ext_modules = win32_extensions + com_extensions + pythonwin_extensions + \
!                     other_extensions,
  
        package_dir = {"win32com": "com/win32com",
                       "win32comext": "com/win32comext",
!                      "pythonwin": "pythonwin",},
        packages = packages,
        py_modules = py_modules,
***************
*** 1116,1119 ****
--- 1144,1148 ----
                  # win32com docs
                  'com/win32com/HTML/*',
+                 'com/win32comext/adsi/demos/*',
                  # Active Scripting test and demos.
                  'com/win32comext/axscript/test/*',
***************
*** 1125,1128 ****
--- 1154,1163 ----
                  'com/win32comext/taskscheduler/test/*.py',
                  'com/win32comext/ifilter/demo/*.py',
+                 'isapi/*.txt',
+                 'isapi/samples/*.py',
+                 'isapi/samples/*.txt',
+                 'isapi/doc/*.html',
+                 'isapi/test/*.py',
+                 'isapi/test/*.txt',
                   ]) +
                  # The headers and .lib files