[pywin32-checkins] pywin32 setup.py,1.1,1.2 setup_win32all.py,1.37,1.38

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

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

Modified Files:
	setup.py setup_win32all.py 
Log Message:
Make setup.py the official build script, and setup_win32all.py now prints
a warning and executes setup.py

Make swig_sources() work with Python 2.4


Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup.py	11 Oct 2004 06:43:57 -0000	1.1
--- setup.py	18 Oct 2004 06:02:35 -0000	1.2
***************
*** 1,5 ****
! # Eventually setup_win32all.py will be renamed to setup.py
! # When we do that, we will put a warning + the execfile in setup_win32all.py
! import sys, os
! mydir=os.path.dirname(sys.argv[0])
! execfile(os.path.join(mydir, "setup_win32all.py"))
--- 1,1212 ----
! build_number=203
! # Putting buildno at the top prevents automatic __doc__ assignment, and
! # I *want* the build number at the top :)
! __doc__="""This is a distutils setup-script for the pywin32 extnesions
[...1188 lines suppressed...]
! # Custom script we run at the end of installing - this is the same script
! # run by bdist_wininst, but the standard 'install' command doesn't seem
! # to have such a concept.
! # This child process won't be able to install the system DLLs until our
! # process has terminated (as distutils imports win32api!), so we must use
! # some 'no wait' executor - spawn seems fine!  We pass the PID of this
! # process so the child will wait for us.
! # XXX - hmm - a closer look at distutils shows it only uses win32api
! # if _winreg fails - and this never should.  Need to revisit this!
! if not dist.dry_run and dist.command_obj.has_key('install') \
!        and not dist.command_obj.has_key('bdist_wininst'):
!     # What executable to use?  This one I guess.
!     filename = os.path.join(
!                   os.path.dirname(sys.argv[0]), "pywin32_postinstall.py")
!     if not os.path.isfile(filename):
!         raise RuntimeError, "Can't find pywin32_postinstall.py"
!     print "Executing post install script..."
!     os.spawnl(os.P_NOWAIT, sys.executable,
!               sys.executable, filename,
!               "-quiet", "-wait", str(os.getpid()), "-install")

Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** setup_win32all.py	10 Oct 2004 22:15:16 -0000	1.37
--- setup_win32all.py	18 Oct 2004 06:02:35 -0000	1.38
***************
*** 1,1219 ****
! build_number=203
! # Putting buildno at the top prevents automatic __doc__ assignment, and
! # I *want* the build number at the top :)
! __doc__="""This is a distutils setup-script for win32all
! 
! To build the win32all extensions, simply execute:
!   python setup_win32all.py -q build
! 
! These extensions require a number of libraries to build, some of which may
! require you to install special SDKs or toolkits.  This script will attempt
[...1196 lines suppressed...]
! # XXX - hmm - a closer look at distutils shows it only uses win32api
! # if _winreg fails - and this never should.  Need to revisit this!
! if not dist.dry_run and dist.command_obj.has_key('install') \
!        and not dist.command_obj.has_key('bdist_wininst'):
!     # What executable to use?  This one I guess.
!     filename = os.path.join(
!                   os.path.dirname(sys.argv[0]), "pywin32_postinstall.py")
!     if not os.path.isfile(filename):
!         raise RuntimeError, "Can't find pywin32_postinstall.py"
!     print "Executing post install script..."
!     os.spawnl(os.P_NOWAIT, sys.executable,
!               sys.executable, filename,
!               "-quiet", "-wait", str(os.getpid()), "-install")
--- 1,6 ----
! # The build script used to be called setup_win32all.py
! # We will remove this in a few versions, but give people the hint
! print "Please use 'setup.py' instead of 'setup_win32all.py'"
! import sys, os
! mydir=os.path.dirname(sys.argv[0])
! execfile(os.path.join(mydir, "setup_win32all.py"))