/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Robert Collins
  • Date: 2009-02-25 00:31:09 UTC
  • mfrom: (4043 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4044.
  • Revision ID: robertc@robertcollins.net-20090225003109-9ngqolksoevjw5ay
Merge bzr.dev, adjust effort tests reducing the effort in line with the write_group avoidance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
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,