[pywin32-checkins] pywin32 setup_win32all.py,1.14,1.15

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

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

Modified Files:
	setup_win32all.py 
Log Message:
Fix slight confusion caused by 2 service related projects being built
from the same source file.
Ass taskscheduler module


Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** setup_win32all.py	7 Feb 2004 09:55:11 -0000	1.14
--- setup_win32all.py	10 Apr 2004 05:19:20 -0000	1.15
***************
*** 436,441 ****
          for undef in ext.undef_macros:
              macros.append((undef,))
          # 2.2 has no 'depends' param.
!         kw = {'output_dir': self.build_temp,
                'macros': macros,
                'include_dirs': ext.include_dirs,
--- 436,447 ----
          for undef in ext.undef_macros:
              macros.append((undef,))
+         # Note: custom 'output_dir' needed due to servicemanager.pyd and
+         # pythonservice.exe being built from the same .cpp file - without
+         # this, distutils gets confused, as they both try and use the same
+         # .obj.
+         output_dir = os.path.join(self.build_temp, ext.name)
+         print "OD is", output_dir
          # 2.2 has no 'depends' param.
!         kw = {'output_dir': output_dir,
                'macros': macros,
                'include_dirs': ext.include_dirs,
***************
*** 481,485 ****
              "executable",
              objects, ext_filename, **kw)
!         
      def build_extension(self, ext):
          # It is well known that some of these extensions are difficult to
--- 487,492 ----
              "executable",
              objects, ext_filename, **kw)
! 
! 
      def build_extension(self, ext):
          # It is well known that some of these extensions are difficult to
***************
*** 556,559 ****
--- 563,569 ----
              extra = self.debug and "_d.exe" or ".exe"
              return r"win32\win32popenWin9x" + extra
+         elif name.endswith("win32.pythonservice"):
+             extra = self.debug and "_d.exe" or ".exe"
+             return r"win32\pythonservice" + extra
          elif name.endswith("pythonwin.Pythonwin"):
              extra = self.debug and "_d.exe" or ".exe"
***************
*** 765,769 ****
                                        EDKMAPI mapi32 version""",
                           extra_link_args=["/nodefaultlib:libc"]),
!     WinExt_win32com('shell', libraries='shell32', pch_header="shell_pch.h")
  ]
  
--- 775,780 ----
                                        EDKMAPI mapi32 version""",
                           extra_link_args=["/nodefaultlib:libc"]),
!     WinExt_win32com('shell', libraries='shell32', pch_header="shell_pch.h"),
!     WinExt_win32com('taskscheduler', libraries='mstask'),
  ]
  
***************
*** 779,782 ****
--- 790,798 ----
      WinExt_win32("win32popenWin9x",
                   libraries = "user32"),
+     WinExt_win32("pythonservice",
+                  dsp_file = "win32/PythonService EXE.dsp",
+                  extra_compile_args = ['-DUNICODE', '-D_UNICODE', '-DWINNT'],
+                  extra_link_args=["/SUBSYSTEM:CONSOLE"],
+                  libraries = "user32 advapi32 ole32 shell32"),
      WinExt_pythonwin("Pythonwin", extra_link_args=["/SUBSYSTEM:WINDOWS"]),
      ]
***************
*** 895,898 ****
--- 911,915 ----
            'win32comext.internet',
            'win32comext.axcontrol',
+           'win32comext.taskscheduler',
  
            'pythonwin.pywin',