← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
209
209
            build_ext.build_extension(self, ext)
210
210
        except CCompilerError:
211
211
            if not self.allow_python_fallback:
212
 
                log.warn('\n  Cannot build extensions.\n'
 
212
                log.warn('\n  Cannot build extension "%s".\n'
213
213
                         '  Use "build_ext --allow-python-fallback" to use'
214
214
                         ' slower python implementations instead.\n'
215
215
                         % (ext.name,))
616
616
 
617
617
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
618
618
    # in on Vista.
619
 
    dll_excludes.append("MSWSOCK.dll")
 
619
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
620
620
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
621
621
                               "includes": includes,
622
622
                               "excludes": excludes,