diff options
Diffstat (limited to 'distutils2/command')
| -rw-r--r-- | distutils2/command/__init__.py | 50 | ||||
| -rw-r--r-- | distutils2/command/bdist_msi.py | 2 | ||||
| -rw-r--r-- | distutils2/command/bdist_wininst.py | 2 | ||||
| -rw-r--r-- | distutils2/command/build.py | 6 | ||||
| -rw-r--r-- | distutils2/command/install_dist.py | 2 |
5 files changed, 26 insertions, 36 deletions
diff --git a/distutils2/command/__init__.py b/distutils2/command/__init__.py index 5bbdb82..774a424 100644 --- a/distutils2/command/__init__.py +++ b/distutils2/command/__init__.py @@ -6,38 +6,28 @@ from distutils2.util import resolve_name __all__ = ['get_command_names', 'set_command', 'get_command_class', 'STANDARD_COMMANDS'] -_COMMANDS = { - 'check': 'distutils2.command.check.check', - 'test': 'distutils2.command.test.test', - 'build': 'distutils2.command.build.build', - 'build_py': 'distutils2.command.build_py.build_py', - 'build_ext': 'distutils2.command.build_ext.build_ext', - 'build_clib': 'distutils2.command.build_clib.build_clib', - 'build_scripts': 'distutils2.command.build_scripts.build_scripts', - 'clean': 'distutils2.command.clean.clean', - 'install_dist': 'distutils2.command.install_dist.install_dist', - 'install_lib': 'distutils2.command.install_lib.install_lib', - 'install_headers': 'distutils2.command.install_headers.install_headers', - 'install_scripts': 'distutils2.command.install_scripts.install_scripts', - 'install_data': 'distutils2.command.install_data.install_data', - 'install_distinfo': - 'distutils2.command.install_distinfo.install_distinfo', - 'sdist': 'distutils2.command.sdist.sdist', - 'bdist': 'distutils2.command.bdist.bdist', - 'bdist_dumb': 'distutils2.command.bdist_dumb.bdist_dumb', - 'bdist_wininst': 'distutils2.command.bdist_wininst.bdist_wininst', - 'register': 'distutils2.command.register.register', - 'upload': 'distutils2.command.upload.upload', - 'upload_docs': 'distutils2.command.upload_docs.upload_docs', -} - -# XXX this is crappy + +STANDARD_COMMANDS = [ + # packaging + 'check', 'test', + # building + 'build', 'build_py', 'build_ext', 'build_clib', 'build_scripts', 'clean', + # installing + 'install_dist', 'install_lib', 'install_headers', 'install_scripts', + 'install_data', 'install_distinfo', + # distributing + 'sdist', 'bdist', 'bdist_dumb', 'bdist_wininst', + 'register', 'upload', 'upload_docs', + ] + if os.name == 'nt': - _COMMANDS['bdist_msi'] = 'distutils2.command.bdist_msi.bdist_msi' + STANDARD_COMMANDS.insert(STANDARD_COMMANDS.index('bdist_wininst'), + 'bdist_msi') -# XXX use OrderedDict to preserve the grouping (build-related, install-related, -# distribution-related) -STANDARD_COMMANDS = set(_COMMANDS) +# XXX maybe we need more than one registry, so that --list-comands can display +# standard, custom and overriden standard commands differently +_COMMANDS = dict((name, 'distutils2.command.%s.%s' % (name, name)) + for name in STANDARD_COMMANDS) def get_command_names(): diff --git a/distutils2/command/bdist_msi.py b/distutils2/command/bdist_msi.py index 43fbe66..ddbc61f 100644 --- a/distutils2/command/bdist_msi.py +++ b/distutils2/command/bdist_msi.py @@ -203,7 +203,7 @@ class bdist_msi(Command): target_version = self.target_version if not target_version: assert self.skip_build, "Should have already checked this" - target_version = sys.version[0:3] + target_version = '%s.%s' % sys.version_info[:2] plat_specifier = ".%s-%s" % (self.plat_name, target_version) build = self.get_finalized_command('build') build.build_lib = os.path.join(build.build_base, diff --git a/distutils2/command/bdist_wininst.py b/distutils2/command/bdist_wininst.py index 4eab6bc..8de798e 100644 --- a/distutils2/command/bdist_wininst.py +++ b/distutils2/command/bdist_wininst.py @@ -136,7 +136,7 @@ class bdist_wininst(Command): target_version = self.target_version if not target_version: assert self.skip_build, "Should have already checked this" - target_version = sys.version[0:3] + target_version = '%s.%s' % sys.version_info[:2] plat_specifier = ".%s-%s" % (self.plat_name, target_version) build = self.get_finalized_command('build') build.build_lib = os.path.join(build.build_base, diff --git a/distutils2/command/build.py b/distutils2/command/build.py index 708b848..d4ace38 100644 --- a/distutils2/command/build.py +++ b/distutils2/command/build.py @@ -82,8 +82,8 @@ class build(Command): raise PackagingOptionError( "--plat-name only supported on Windows (try " "using './configure --help' on your platform)") - - plat_specifier = ".%s-%s" % (self.plat_name, sys.version[0:3]) + pyversion = '%s.%s' % sys.version_info[:2] + plat_specifier = ".%s-%s" % (self.plat_name, pyversion) # Make it so Python 2.x and Python 2.x with --with-pydebug don't # share the same build directories. Doing so confuses the build @@ -116,7 +116,7 @@ class build(Command): 'temp' + plat_specifier) if self.build_scripts is None: self.build_scripts = os.path.join(self.build_base, - 'scripts-' + sys.version[0:3]) + 'scripts-' + pyversion) if self.executable is None: self.executable = os.path.normpath(sys.executable) diff --git a/distutils2/command/install_dist.py b/distutils2/command/install_dist.py index 8d8b675..3dc481c 100644 --- a/distutils2/command/install_dist.py +++ b/distutils2/command/install_dist.py @@ -242,7 +242,7 @@ class install_dist(Command): # $platbase in the other installation directories and not worry # about needing recursive variable expansion (shudder). - py_version = sys.version.split()[0] + py_version = '%s.%s' % sys.version_info[:2] prefix, exec_prefix, srcdir, projectbase = get_config_vars( 'prefix', 'exec_prefix', 'srcdir', 'projectbase') |