← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Vincent Ladeuil
  • Date: 2010-11-05 14:07:45 UTC
  • mfrom: (5050.45.7 2.2)
  • mto: This revision was merged to the branch mainline in revision 5524.
  • Revision ID: v.ladeuil+lp@free.fr-20101105140745-e5xwb9b75a4i7ef1
Merge 2.2 into trunk resolving conflicts and including fix for bug #632465

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
689
689
 
690
690
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
691
691
    # in on Vista.
692
 
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
 
692
    dll_excludes.extend(["MSWSOCK.dll",
 
693
                         "MSVCP60.dll",
 
694
                         "MSVCP90.dll",
 
695
                         "powrprof.dll"])
693
696
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
694
697
                               "includes": includes,
695
698
                               "excludes": excludes,