← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

merge trunk

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