mirror of
https://github.com/python/cpython.git
synced 2025-07-19 17:25:54 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ........ r62194 | jeffrey.yasskin | 2008-04-07 01:04:28 +0200 (Mon, 07 Apr 2008) | 7 lines Add enough debugging information to diagnose failures where the HandlerBException is ignored, and fix one such problem, where it was thrown during the __del__ method of the previous Popen object. We may want to find a better way of printing verbose information so it's not spammy when the test passes. ........ r62197 | mark.hammond | 2008-04-07 03:53:39 +0200 (Mon, 07 Apr 2008) | 2 lines Issue #2513: enable 64bit cross compilation on windows. ........ r62198 | mark.hammond | 2008-04-07 03:59:40 +0200 (Mon, 07 Apr 2008) | 2 lines correct heading underline for new "Cross-compiling on Windows" section ........ r62204 | gregory.p.smith | 2008-04-07 08:33:21 +0200 (Mon, 07 Apr 2008) | 4 lines Use the new PyFile_IncUseCount & PyFile_DecUseCount calls appropriatly within the standard library. These modules use PyFile_AsFile and later release the GIL while operating on the previously returned FILE*. ........ r62205 | mark.summerfield | 2008-04-07 09:39:23 +0200 (Mon, 07 Apr 2008) | 4 lines changed "2500 components" to "several thousand" since the number keeps growning:-) ........ r62214 | georg.brandl | 2008-04-07 20:51:59 +0200 (Mon, 07 Apr 2008) | 2 lines #2525: update timezone info examples in the docs. ........ r62219 | andrew.kuchling | 2008-04-08 01:57:07 +0200 (Tue, 08 Apr 2008) | 1 line Write PEP 3127 section; add items ........ r62220 | andrew.kuchling | 2008-04-08 01:57:21 +0200 (Tue, 08 Apr 2008) | 1 line Typo fix ........ r62221 | andrew.kuchling | 2008-04-08 03:33:10 +0200 (Tue, 08 Apr 2008) | 1 line Typographical fix: 32bit -> 32-bit, 64bit -> 64-bit ........ r62227 | andrew.kuchling | 2008-04-08 23:22:53 +0200 (Tue, 08 Apr 2008) | 1 line Add items ........ r62229 | amaury.forgeotdarc | 2008-04-08 23:27:42 +0200 (Tue, 08 Apr 2008) | 7 lines Issue2564: Prevent a hang in "import test.autotest", which runs the entire test suite as a side-effect of importing the module. - in test_capi, a thread tried to import other modules - re.compile() imported sre_parse again on every call. ........ r62230 | amaury.forgeotdarc | 2008-04-08 23:51:57 +0200 (Tue, 08 Apr 2008) | 2 lines Prevent an error when inspect.isabstract() is called with something else than a new-style class. ........ r62231 | amaury.forgeotdarc | 2008-04-09 00:07:05 +0200 (Wed, 09 Apr 2008) | 8 lines Issue 2408: remove the _types module It was only used as a helper in types.py to access types (GetSetDescriptorType and MemberDescriptorType), when they can easily be obtained with python code. These expressions even work with Jython. I don't know what the future of the types module is; (cf. discussion in http://bugs.python.org/issue1605 ) at least this change makes it simpler. ........ r62233 | amaury.forgeotdarc | 2008-04-09 01:10:07 +0200 (Wed, 09 Apr 2008) | 2 lines Add a NEWS entry for previous checkin ........ r62234 | trent.nelson | 2008-04-09 01:47:30 +0200 (Wed, 09 Apr 2008) | 37 lines - Issue #2550: The approach used by client/server code for obtaining ports to listen on in network-oriented tests has been refined in an effort to facilitate running multiple instances of the entire regression test suite in parallel without issue. test_support.bind_port() has been fixed such that it will always return a unique port -- which wasn't always the case with the previous implementation, especially if socket options had been set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The new implementation of bind_port() will actually raise an exception if it is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or SO_REUSEPORT socket option set. Furthermore, if available, bind_port() will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed. This currently only applies to Windows. This option prevents any other sockets from binding to the host/port we've bound to, thus removing the possibility of the 'non-deterministic' behaviour, as Microsoft puts it, that occurs when a second SOCK_STREAM socket binds and accepts to a host/port that's already been bound by another socket. The optional preferred port parameter to bind_port() has been removed. Under no circumstances should tests be hard coding ports! test_support.find_unused_port() has also been introduced, which will pass a temporary socket object to bind_port() in order to obtain an unused port. The temporary socket object is then closed and deleted, and the port is returned. This method should only be used for obtaining an unused port in order to pass to an external program (i.e. the -accept [port] argument to openssl's s_server mode) or as a parameter to a server-oriented class that doesn't give you direct access to the underlying socket used. Finally, test_support.HOST has been introduced, which should be used for the host argument of any relevant socket calls (i.e. bind and connect). The following tests were updated to following the new conventions: test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib, test_poplib, test_ftplib, test_telnetlib, test_socketserver, test_asynchat and test_socket_ssl. It is now possible for multiple instances of the regression test suite to run in parallel without issue. ........ r62235 | gregory.p.smith | 2008-04-09 02:25:17 +0200 (Wed, 09 Apr 2008) | 3 lines Fix zlib crash from zlib.decompressobj().flush(val) when val was not positive. It tried to allocate negative or zero memory. That fails. ........ r62237 | trent.nelson | 2008-04-09 02:34:53 +0200 (Wed, 09 Apr 2008) | 1 line Fix typo with regards to self.PORT shadowing class variables with the same name. ........ r62238 | andrew.kuchling | 2008-04-09 03:08:32 +0200 (Wed, 09 Apr 2008) | 1 line Add items ........ r62239 | jerry.seutter | 2008-04-09 07:07:58 +0200 (Wed, 09 Apr 2008) | 1 line Changed test so it no longer runs as a side effect of importing. ........
320 lines
13 KiB
Python
320 lines
13 KiB
Python
"""distutils.command.bdist_wininst
|
|
|
|
Implements the Distutils 'bdist_wininst' command: create a windows installer
|
|
exe-program."""
|
|
|
|
__revision__ = "$Id$"
|
|
|
|
import sys, os
|
|
from distutils.core import Command
|
|
from distutils.util import get_platform
|
|
from distutils.dir_util import create_tree, remove_tree
|
|
from distutils.errors import *
|
|
from distutils.sysconfig import get_python_version
|
|
from distutils import log
|
|
|
|
class bdist_wininst(Command):
|
|
|
|
description = "create an executable installer for MS Windows"
|
|
|
|
user_options = [('bdist-dir=', None,
|
|
"temporary directory for creating the distribution"),
|
|
('plat-name=', 'p',
|
|
"platform name to embed in generated filenames "
|
|
"(default: %s)" % get_platform()),
|
|
('keep-temp', 'k',
|
|
"keep the pseudo-installation tree around after " +
|
|
"creating the distribution archive"),
|
|
('target-version=', None,
|
|
"require a specific python version" +
|
|
" on the target system"),
|
|
('no-target-compile', 'c',
|
|
"do not compile .py to .pyc on the target system"),
|
|
('no-target-optimize', 'o',
|
|
"do not compile .py to .pyo (optimized)"
|
|
"on the target system"),
|
|
('dist-dir=', 'd',
|
|
"directory to put final built distributions in"),
|
|
('bitmap=', 'b',
|
|
"bitmap to use for the installer instead of python-powered logo"),
|
|
('title=', 't',
|
|
"title to display on the installer background instead of default"),
|
|
('skip-build', None,
|
|
"skip rebuilding everything (for testing/debugging)"),
|
|
('install-script=', None,
|
|
"basename of installation script to be run after"
|
|
"installation or before deinstallation"),
|
|
('pre-install-script=', None,
|
|
"Fully qualified filename of a script to be run before "
|
|
"any files are installed. This script need not be in the "
|
|
"distribution"),
|
|
]
|
|
|
|
boolean_options = ['keep-temp', 'no-target-compile', 'no-target-optimize',
|
|
'skip-build']
|
|
|
|
def initialize_options(self):
|
|
self.bdist_dir = None
|
|
self.plat_name = None
|
|
self.keep_temp = 0
|
|
self.no_target_compile = 0
|
|
self.no_target_optimize = 0
|
|
self.target_version = None
|
|
self.dist_dir = None
|
|
self.bitmap = None
|
|
self.title = None
|
|
self.skip_build = 0
|
|
self.install_script = None
|
|
self.pre_install_script = None
|
|
|
|
|
|
def finalize_options(self):
|
|
if self.bdist_dir is None:
|
|
bdist_base = self.get_finalized_command('bdist').bdist_base
|
|
self.bdist_dir = os.path.join(bdist_base, 'wininst')
|
|
if not self.target_version:
|
|
self.target_version = ""
|
|
if not self.skip_build and self.distribution.has_ext_modules():
|
|
short_version = get_python_version()
|
|
if self.target_version and self.target_version != short_version:
|
|
raise DistutilsOptionError(
|
|
"target version can only be %s, or the '--skip_build'" \
|
|
" option must be specified" % (short_version,))
|
|
self.target_version = short_version
|
|
|
|
self.set_undefined_options('bdist',
|
|
('dist_dir', 'dist_dir'),
|
|
('plat_name', 'plat_name'),
|
|
)
|
|
|
|
if self.install_script:
|
|
for script in self.distribution.scripts:
|
|
if self.install_script == os.path.basename(script):
|
|
break
|
|
else:
|
|
raise DistutilsOptionError(
|
|
"install_script '%s' not found in scripts"
|
|
% self.install_script)
|
|
|
|
def run(self):
|
|
if (sys.platform != "win32" and
|
|
(self.distribution.has_ext_modules() or
|
|
self.distribution.has_c_libraries())):
|
|
raise DistutilsPlatformError \
|
|
("distribution contains extensions and/or C libraries; "
|
|
"must be compiled on a Windows 32 platform")
|
|
|
|
if not self.skip_build:
|
|
self.run_command('build')
|
|
|
|
install = self.reinitialize_command('install', reinit_subcommands=1)
|
|
install.root = self.bdist_dir
|
|
install.skip_build = self.skip_build
|
|
install.warn_dir = 0
|
|
install.plat_name = self.plat_name
|
|
|
|
install_lib = self.reinitialize_command('install_lib')
|
|
# we do not want to include pyc or pyo files
|
|
install_lib.compile = 0
|
|
install_lib.optimize = 0
|
|
|
|
if self.distribution.has_ext_modules():
|
|
# If we are building an installer for a Python version other
|
|
# than the one we are currently running, then we need to ensure
|
|
# our build_lib reflects the other Python version rather than ours.
|
|
# Note that for target_version!=sys.version, we must have skipped the
|
|
# build step, so there is no issue with enforcing the build of this
|
|
# version.
|
|
target_version = self.target_version
|
|
if not target_version:
|
|
assert self.skip_build, "Should have already checked this"
|
|
target_version = sys.version[0:3]
|
|
plat_specifier = ".%s-%s" % (self.plat_name, target_version)
|
|
build = self.get_finalized_command('build')
|
|
build.build_lib = os.path.join(build.build_base,
|
|
'lib' + plat_specifier)
|
|
|
|
# Use a custom scheme for the zip-file, because we have to decide
|
|
# at installation time which scheme to use.
|
|
for key in ('purelib', 'platlib', 'headers', 'scripts', 'data'):
|
|
value = key.upper()
|
|
if key == 'headers':
|
|
value = value + '/Include/$dist_name'
|
|
setattr(install,
|
|
'install_' + key,
|
|
value)
|
|
|
|
log.info("installing to %s", self.bdist_dir)
|
|
install.ensure_finalized()
|
|
|
|
# avoid warning of 'install_lib' about installing
|
|
# into a directory not in sys.path
|
|
sys.path.insert(0, os.path.join(self.bdist_dir, 'PURELIB'))
|
|
|
|
install.run()
|
|
|
|
del sys.path[0]
|
|
|
|
# And make an archive relative to the root of the
|
|
# pseudo-installation tree.
|
|
from tempfile import mktemp
|
|
archive_basename = mktemp()
|
|
fullname = self.distribution.get_fullname()
|
|
arcname = self.make_archive(archive_basename, "zip",
|
|
root_dir=self.bdist_dir)
|
|
# create an exe containing the zip-file
|
|
self.create_exe(arcname, fullname, self.bitmap)
|
|
if self.distribution.has_ext_modules():
|
|
pyversion = get_python_version()
|
|
else:
|
|
pyversion = 'any'
|
|
self.distribution.dist_files.append(('bdist_wininst', pyversion,
|
|
self.get_installer_filename(fullname)))
|
|
# remove the zip-file again
|
|
log.debug("removing temporary file '%s'", arcname)
|
|
os.remove(arcname)
|
|
|
|
if not self.keep_temp:
|
|
remove_tree(self.bdist_dir, dry_run=self.dry_run)
|
|
|
|
def get_inidata(self):
|
|
# Return data describing the installation.
|
|
lines = []
|
|
metadata = self.distribution.metadata
|
|
|
|
# Write the [metadata] section.
|
|
lines.append("[metadata]")
|
|
|
|
# 'info' will be displayed in the installer's dialog box,
|
|
# describing the items to be installed.
|
|
info = (metadata.long_description or '') + '\n'
|
|
|
|
# Escape newline characters
|
|
def escape(s):
|
|
return s.replace("\n", "\\n")
|
|
|
|
for name in ["author", "author_email", "description", "maintainer",
|
|
"maintainer_email", "name", "url", "version"]:
|
|
data = getattr(metadata, name, "")
|
|
if data:
|
|
info = info + ("\n %s: %s" % \
|
|
(name.capitalize(), escape(data)))
|
|
lines.append("%s=%s" % (name, escape(data)))
|
|
|
|
# The [setup] section contains entries controlling
|
|
# the installer runtime.
|
|
lines.append("\n[Setup]")
|
|
if self.install_script:
|
|
lines.append("install_script=%s" % self.install_script)
|
|
lines.append("info=%s" % escape(info))
|
|
lines.append("target_compile=%d" % (not self.no_target_compile))
|
|
lines.append("target_optimize=%d" % (not self.no_target_optimize))
|
|
if self.target_version:
|
|
lines.append("target_version=%s" % self.target_version)
|
|
|
|
title = self.title or self.distribution.get_fullname()
|
|
lines.append("title=%s" % escape(title))
|
|
import time
|
|
import distutils
|
|
build_info = "Built %s with distutils-%s" % \
|
|
(time.ctime(time.time()), distutils.__version__)
|
|
lines.append("build_info=%s" % build_info)
|
|
return "\n".join(lines)
|
|
|
|
def create_exe(self, arcname, fullname, bitmap=None):
|
|
import struct
|
|
|
|
self.mkpath(self.dist_dir)
|
|
|
|
cfgdata = self.get_inidata()
|
|
|
|
installer_name = self.get_installer_filename(fullname)
|
|
self.announce("creating %s" % installer_name)
|
|
|
|
if bitmap:
|
|
bitmapdata = open(bitmap, "rb").read()
|
|
bitmaplen = len(bitmapdata)
|
|
else:
|
|
bitmaplen = 0
|
|
|
|
file = open(installer_name, "wb")
|
|
file.write(self.get_exe_bytes())
|
|
if bitmap:
|
|
file.write(bitmapdata)
|
|
|
|
# Convert cfgdata from unicode to ascii, mbcs encoded
|
|
if isinstance(cfgdata, str):
|
|
cfgdata = cfgdata.encode("mbcs")
|
|
|
|
# Append the pre-install script
|
|
cfgdata = cfgdata + "\0"
|
|
if self.pre_install_script:
|
|
script_data = open(self.pre_install_script, "r").read()
|
|
cfgdata = cfgdata + script_data + "\n\0"
|
|
else:
|
|
# empty pre-install script
|
|
cfgdata = cfgdata + "\0"
|
|
file.write(cfgdata)
|
|
|
|
# The 'magic number' 0x1234567B is used to make sure that the
|
|
# binary layout of 'cfgdata' is what the wininst.exe binary
|
|
# expects. If the layout changes, increment that number, make
|
|
# the corresponding changes to the wininst.exe sources, and
|
|
# recompile them.
|
|
header = struct.pack("<iii",
|
|
0x1234567B, # tag
|
|
len(cfgdata), # length
|
|
bitmaplen, # number of bytes in bitmap
|
|
)
|
|
file.write(header)
|
|
file.write(open(arcname, "rb").read())
|
|
|
|
def get_installer_filename(self, fullname):
|
|
# Factored out to allow overriding in subclasses
|
|
if self.target_version:
|
|
# if we create an installer for a specific python version,
|
|
# it's better to include this in the name
|
|
installer_name = os.path.join(self.dist_dir,
|
|
"%s.%s-py%s.exe" %
|
|
(fullname, self.plat_name, self.target_version))
|
|
else:
|
|
installer_name = os.path.join(self.dist_dir,
|
|
"%s.%s.exe" % (fullname, self.plat_name))
|
|
return installer_name
|
|
|
|
def get_exe_bytes(self):
|
|
from distutils.msvccompiler import get_build_version
|
|
# If a target-version other than the current version has been
|
|
# specified, then using the MSVC version from *this* build is no good.
|
|
# Without actually finding and executing the target version and parsing
|
|
# its sys.version, we just hard-code our knowledge of old versions.
|
|
# NOTE: Possible alternative is to allow "--target-version" to
|
|
# specify a Python executable rather than a simple version string.
|
|
# We can then execute this program to obtain any info we need, such
|
|
# as the real sys.version string for the build.
|
|
cur_version = get_python_version()
|
|
if self.target_version and self.target_version != cur_version:
|
|
# If the target version is *later* than us, then we assume they
|
|
# use what we use
|
|
# string compares seem wrong, but are what sysconfig.py itself uses
|
|
if self.target_version > cur_version:
|
|
bv = get_build_version()
|
|
else:
|
|
if self.target_version < "2.4":
|
|
bv = 6.0
|
|
else:
|
|
bv = 7.1
|
|
else:
|
|
# for current version - use authoritative check.
|
|
bv = get_build_version()
|
|
|
|
# wininst-x.y.exe is in the same directory as this file
|
|
directory = os.path.dirname(__file__)
|
|
# we must use a wininst-x.y.exe built with the same C compiler
|
|
# used for python. XXX What about mingw, borland, and so on?
|
|
if self.plat_name == 'win32':
|
|
sfix = ''
|
|
else:
|
|
sfix = self.plat_name[3:] # strip 'win' - leaves eg '-amd64'
|
|
filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
|
|
return open(filename, "rb").read()
|