← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
172
172
## Setup
173
173
########################
174
174
 
175
 
from tools.build_mo import build_mo
 
175
from bzrlib.bzr_distutils import build_mo
176
176
 
177
177
command_classes = {'install_scripts': my_install_scripts,
178
178
                   'build': bzr_build,
202
202
    from distutils.command.build_ext import build_ext
203
203
else:
204
204
    have_pyrex = True
205
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
 
205
    pyrex_version_info = tuple(map(int, pyrex_version.rstrip("+").split('.')))
206
206
 
207
207
 
208
208
class build_ext_if_possible(build_ext):
482
482
    packages.append('sqlite3')
483
483
 
484
484
 
 
485
def get_git_py2exe_info(includes, excludes, packages):
 
486
    packages.append('dulwich')
 
487
 
 
488
 
485
489
def get_fastimport_py2exe_info(includes, excludes, packages):
486
490
    # This is the python-fastimport package, not to be confused with the
487
491
    # bzr-fastimport plugin.
680
684
    if 'svn' in plugins:
681
685
        get_svn_py2exe_info(includes, excludes, packages)
682
686
 
 
687
    if 'git' in plugins:
 
688
        get_git_py2exe_info(includes, excludes, packages)
 
689
 
683
690
    if 'fastimport' in plugins:
684
691
        get_fastimport_py2exe_info(includes, excludes, packages)
685
692