/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

merge bzr.dev r4054

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
408
408
        os.environ["PATH"] = path + os.pathsep + qt_dir
409
409
 
410
410
 
 
411
def get_svn_py2exe_info(includes, excludes, packages):
 
412
    packages.append('subvertpy')
 
413
 
 
414
 
411
415
if 'bdist_wininst' in sys.argv:
412
416
    def find_docs():
413
417
        docs = []
586
590
    if 'qbzr' in plugins:
587
591
        get_qbzr_py2exe_info(includes, excludes, packages)
588
592
 
 
593
    if 'svn' in plugins:
 
594
        get_svn_py2exe_info(includes, excludes, packages)
 
595
 
589
596
    if "TBZR" in os.environ:
590
597
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
591
598
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
609
616
 
610
617
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
611
618
    # in on Vista.
612
 
    dll_excludes.append("MSWSOCK.dll")
 
619
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
613
620
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
614
621
                               "includes": includes,
615
622
                               "excludes": excludes,