Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8815
Modified Files:
setup.py
Log Message:
remove some bdist_msi hackery now that python's svn trunk has some fixes.
Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** setup.py 18 Jul 2007 08:50:24 -0000 1.62
--- setup.py 21 Aug 2007 05:32:26 -0000 1.63
***************
*** 73,77 ****
* Execute: c:\path_to_32bit_python\python.exe setup.py build
* un-set PYTHONHOME (set PYTHONHOME=)
! * Execute: c:\path_to_32bit_python\python.exe setup.py bdist_msi
(Note that these instructions will have clobbered your 32bit build of
--- 73,80 ----
* Execute: c:\path_to_32bit_python\python.exe setup.py build
* un-set PYTHONHOME (set PYTHONHOME=)
! * Execute: c:\path_to_32bit_python_6\python.exe setup.py bdist_msi --skip-build
! [Note that python 6.0 or later *must* be used for this final step. If
! python 6 has not been released, you must use Python as built from the
! svn trunk]
(Note that these instructions will have clobbered your 32bit build of
***************
*** 127,136 ****
# so we monkey-patch distutils :( We must do this before the main distutils
# imports, which generall does 'from distutils.util import get_platform'
def hacked_get_platform():
"""getplaform monkey-patched by pywin32 setup"""
! if is_32bit:
! return sys.platform
! else:
! return get_build_architecture().lower()
import distutils.util
--- 130,145 ----
# so we monkey-patch distutils :( We must do this before the main distutils
# imports, which generall does 'from distutils.util import get_platform'
+ # NOTE: Python 2.6 has the base get_platform() fixed - but there still
+ # remains the cross-compile issue (ie, get_platform() needs to know the
+ # *target* platform). The values returned from this function must however
+ # be in the set of values Python 2.6's get_platform() returns...
def hacked_get_platform():
"""getplaform monkey-patched by pywin32 setup"""
! ba = get_build_architecture()
! if ba == "AMD64":
! return "win-x86_64"
! if ba == "Itanium":
! return "win-ia64"
! return sys.platform
import distutils.util
***************
*** 1053,1066 ****
"-quiet", "-wait", str(os.getpid()), "-install")
- if bdist_msi:
- class my_bdist_msi(bdist_msi):
- def get_installer_filename(self, fullname):
- # base class hard-codes 'win32'
- plat = distutils.util.get_platform()
- installer_name = os.path.join(self.dist_dir,
- "%s.%s-py%s.msi" %
- (fullname, plat, self.target_version))
- return installer_name
-
# As per get_source_files, we need special handling so .mc file is
# processed first. It appears there was an intention to fix distutils
--- 1062,1065 ----
***************
*** 1687,1692 ****
'install_data': my_install_data,
}
- if bdist_msi:
- cmdclass['bdist_msi'] = my_bdist_msi
dist = setup(name="pywin32",
--- 1686,1689 ----
|
