← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: John Arbash Meinel
  • Date: 2010-11-05 20:54:32 UTC
  • mfrom: (5526 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5527.
  • Revision ID: john@arbash-meinel.com-20101105205432-rmyozu8sthyhmri8
Merge bzr.dev to resolve bzr-2.3.txt (aka NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
66
66
            'package_data': {'bzrlib': ['doc/api/*.txt',
67
67
                                        'tests/test_patches_data/*',
68
68
                                        'help_topics/en/*.txt',
 
69
                                        'tests/ssl_certs/ca.crt',
69
70
                                        'tests/ssl_certs/server_without_pass.key',
70
71
                                        'tests/ssl_certs/server_with_pass.key',
71
72
                                        'tests/ssl_certs/server.crt'
688
689
 
689
690
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
690
691
    # in on Vista.
691
 
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
 
692
    dll_excludes.extend(["MSWSOCK.dll",
 
693
                         "MSVCP60.dll",
 
694
                         "MSVCP90.dll",
 
695
                         "powrprof.dll"])
692
696
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
693
697
                               "includes": includes,
694
698
                               "excludes": excludes,
727
731
        # easy_install one
728
732
        DATA_FILES = [('man/man1', ['bzr.1'])]
729
733
 
730
 
    if sys.platform != 'win32':
731
 
        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
732
 
        #
733
 
        # checking the paths and hardcoding the check for root is a bit gross,
734
 
        # but I don't see a cleaner way to find out the locations in a way
735
 
        # that's going to align with the hardcoded paths in apport.
736
 
        if os.geteuid() == 0:
737
 
            DATA_FILES += [
738
 
                ('/usr/share/apport/package-hooks',
739
 
                    ['apport/source_bzr.py']),
740
 
                ('/etc/apport/crashdb.conf.d/',
741
 
                    ['apport/bzr-crashdb.conf']),]
742
 
 
743
734
    # std setup
744
735
    ARGS = {'scripts': ['bzr'],
745
736
            'data_files': DATA_FILES,