← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-18 04:55:00 UTC
  • mfrom: (5784.2.1 754188-apport-test)
  • Revision ID: pqm@pqm.ubuntu.com-20110418045500-ce6lkgyiq7f47q43
(mbp) Rewrite test_report_bug_legacy away from using doctest (see bug
 764188) (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
291
291
        # The code it generates re-uses a "local" pointer and
292
292
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
293
293
        # which is NULL safe with PY_DECREF which is not.)
294
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
295
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
 
294
        # <https://bugs.launchpad.net/bzr/+bug/449372>
 
295
        # <https://bugs.launchpad.net/bzr/+bug/276868>
296
296
        print('Cannot build extension "bzrlib._dirstate_helpers_pyx" using')
297
 
        print('your version of pyrex "%s". Please upgrade your pyrex' % (
298
 
            pyrex_version,))
 
297
        print('your version of pyrex "%s". Please upgrade your pyrex'
 
298
              % (pyrex_version,))
299
299
        print('install. For now, the non-compiled (python) version will')
300
300
        print('be used instead.')
301
301
    else:
395
395
    # ditto for the tbzrcommand tool
396
396
    tbzrcommand = dict(
397
397
        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
398
 
        icon_resources = [(0,'bzr.ico')],
 
398
        icon_resources = icon_resources,
 
399
        other_resources = other_resources,
399
400
    )
400
401
    console_targets.append(tbzrcommand)
401
402
    tbzrcommandw = tbzrcommand.copy()
689
690
 
690
691
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
691
692
    # in on Vista.
692
 
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
 
693
    dll_excludes.extend(["MSWSOCK.dll",
 
694
                         "MSVCP60.dll",
 
695
                         "MSVCP90.dll",
 
696
                         "powrprof.dll",
 
697
                         "SHFOLDER.dll"])
693
698
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
694
699
                               "includes": includes,
695
700
                               "excludes": excludes,