← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Jelmer Vernooij
  • Date: 2010-08-28 11:19:49 UTC
  • mto: This revision was merged to the branch mainline in revision 5418.
  • Revision ID: jelmer@samba.org-20100828111949-6ke9opiop2oomr4f
Move get_config to ControlDir.

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',
70
69
                                        'tests/ssl_certs/server_without_pass.key',
71
70
                                        'tests/ssl_certs/server_with_pass.key',
72
71
                                        'tests/ssl_certs/server.crt'
291
290
        # The code it generates re-uses a "local" pointer and
292
291
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
293
292
        # which is NULL safe with PY_DECREF which is not.)
294
 
        # <https://bugs.launchpad.net/bzr/+bug/449372>
295
 
        # <https://bugs.launchpad.net/bzr/+bug/276868>
 
293
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
 
294
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
296
295
        print('Cannot build extension "bzrlib._dirstate_helpers_pyx" using')
297
 
        print('your version of pyrex "%s". Please upgrade your pyrex'
298
 
              % (pyrex_version,))
 
296
        print('your version of pyrex "%s". Please upgrade your pyrex' % (
 
297
            pyrex_version,))
299
298
        print('install. For now, the non-compiled (python) version will')
300
299
        print('be used instead.')
301
300
    else:
395
394
    # ditto for the tbzrcommand tool
396
395
    tbzrcommand = dict(
397
396
        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
398
 
        icon_resources = icon_resources,
399
 
        other_resources = other_resources,
 
397
        icon_resources = [(0,'bzr.ico')],
400
398
    )
401
399
    console_targets.append(tbzrcommand)
402
400
    tbzrcommandw = tbzrcommand.copy()
690
688
 
691
689
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
692
690
    # in on Vista.
693
 
    dll_excludes.extend(["MSWSOCK.dll",
694
 
                         "MSVCP60.dll",
695
 
                         "MSVCP90.dll",
696
 
                         "powrprof.dll",
697
 
                         "SHFOLDER.dll"])
 
691
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
698
692
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
699
693
                               "includes": includes,
700
694
                               "excludes": excludes,
733
727
        # easy_install one
734
728
        DATA_FILES = [('man/man1', ['bzr.1'])]
735
729
 
 
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
 
736
743
    # std setup
737
744
    ARGS = {'scripts': ['bzr'],
738
745
            'data_files': DATA_FILES,