Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3779
Modified Files:
setup_win32all.py
Log Message:
Stop Python 2.2 from always generating SWIG files, fixup the strings
used by wininst, and add a "pre-install-script".
Index: setup_win32all.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup_win32all.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** setup_win32all.py 26 Jan 2004 04:07:18 -0000 1.11
--- setup_win32all.py 5 Feb 2004 23:39:50 -0000 1.12
***************
*** 42,46 ****
from distutils.command.build_ext import build_ext
from distutils.command.install_data import install_data
! from distutils.dep_util import newer_group
from distutils import dir_util, file_util
from distutils.sysconfig import get_python_lib
--- 42,46 ----
from distutils.command.build_ext import build_ext
from distutils.command.install_data import install_data
! from distutils.dep_util import newer_group, newer
from distutils import dir_util, file_util
from distutils.sysconfig import get_python_lib
***************
*** 623,637 ****
["-com_interface_parent", interface_parent])
! swig_cmd.extend(["-o",
! os.path.abspath(target),
! os.path.abspath(source)])
! log.info("swigging %s to %s", source, target)
! out_dir = os.path.dirname(source)
! cwd = os.getcwd()
! os.chdir(out_dir)
! try:
! self.spawn(swig_cmd)
! finally:
! os.chdir(cwd)
return new_sources
--- 623,644 ----
["-com_interface_parent", interface_parent])
! # This 'newer' check helps python 2.2 builds, which otherwise
! # *always* regenerate the .cpp files, meaning every future
! # 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),
! os.path.abspath(source)])
! log.info("swigging %s to %s", source, target)
! out_dir = os.path.dirname(source)
! cwd = os.getcwd()
! os.chdir(out_dir)
! try:
! self.spawn(swig_cmd)
! finally:
! os.chdir(cwd)
! else:
! log.info("skipping swig of %s", source)
return new_sources
***************
*** 909,915 ****
version="200",
description="Python for Window Extensions",
! long_description="Includes access to much of the Win32 API, the "
! "ability to create and use COM objects, and the "
! "Pythonwin environment",
author="Mark Hammond (et al)",
author_email = "mha...@us...",
--- 916,922 ----
version="200",
description="Python for Window Extensions",
! long_description="Includes access to much of the Win32 API, the\n"
! "ability to create and use COM objects, and the\n"
! "Pythonwin environment.",
author="Mark Hammond (et al)",
author_email = "mha...@us...",
***************
*** 920,924 ****
'install_data': my_install_data,
},
! options = {"bdist_wininst": {"install_script": "pywin32_postinstall.py"}},
scripts = ["pywin32_postinstall.py"],
--- 927,935 ----
'install_data': my_install_data,
},
! options = {"bdist_wininst":
! {"install_script": "pywin32_postinstall.py",
! "pre_install_script": "pywin32_preinstall.py",
! },
! },
scripts = ["pywin32_postinstall.py"],
|
