diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-08-29 23:42:50 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-08-29 23:42:50 (GMT) |
| commit | b9fe54cccc3798f089489ef1e7f9026a35d16d6b (patch) | |
| tree | e28f0aa1563038ff6cc0678cc3f327503623d540 /Lib/packaging/command/bdist_wininst.py | |
| parent | 83ab3f319b3b83c84c4df72349b6ce7d5ec936da (diff) | |
| download | cpython-b9fe54cccc3798f089489ef1e7f9026a35d16d6b.zip cpython-b9fe54cccc3798f089489ef1e7f9026a35d16d6b.tar.gz cpython-b9fe54cccc3798f089489ef1e7f9026a35d16d6b.tar.bz2 | |
Make bdist_* commands respect --skip-build passed to bdist (#10946).
There was already a test for this, but it was complicated and had a
subtle bug (custom command objects need to be put in dist.command_obj so
that other command objects may see them) that rendered it moot.
Diffstat (limited to 'Lib/packaging/command/bdist_wininst.py')
| -rw-r--r-- | Lib/packaging/command/bdist_wininst.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/packaging/command/bdist_wininst.py b/Lib/packaging/command/bdist_wininst.py index dbb74ea..7dbb39b 100644 --- a/Lib/packaging/command/bdist_wininst.py +++ b/Lib/packaging/command/bdist_wininst.py @@ -67,13 +67,15 @@ class bdist_wininst(Command): self.dist_dir = None self.bitmap = None self.title = None - self.skip_build = False + self.skip_build = None self.install_script = None self.pre_install_script = None self.user_access_control = None def finalize_options(self): + self.set_undefined_options('bdist', 'skip_build') + if self.bdist_dir is None: if self.skip_build and self.plat_name: # If build is skipped and plat_name is overridden, bdist will @@ -83,8 +85,10 @@ class bdist_wininst(Command): # next the command will be initialized using that name 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: |
