← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
9
9
import os
10
10
import os.path
11
11
import sys
12
 
import copy
13
12
 
14
 
if sys.version_info < (2, 6):
15
 
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.6+\n")
 
13
if sys.version_info < (2, 4):
 
14
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
16
15
    sys.exit(1)
17
16
 
18
17
# NOTE: The directory containing setup.py, whether run by 'python setup.py' or
66
65
            'package_data': {'bzrlib': ['doc/api/*.txt',
67
66
                                        'tests/test_patches_data/*',
68
67
                                        'help_topics/en/*.txt',
69
 
                                        'tests/ssl_certs/ca.crt',
70
68
                                        'tests/ssl_certs/server_without_pass.key',
71
69
                                        'tests/ssl_certs/server_with_pass.key',
72
 
                                        'tests/ssl_certs/server.crt',
73
 
                                        'locale/*/LC_MESSAGES/*.mo',
 
70
                                        'tests/ssl_certs/server.crt'
74
71
                                       ]},
75
72
           }
76
73
 
153
150
    Generate bzr.1.
154
151
    """
155
152
 
156
 
    sub_commands = build.sub_commands + [
157
 
            ('build_mo', lambda _: True),
158
 
            ]
159
 
 
160
153
    def run(self):
161
154
        build.run(self)
162
155
 
168
161
## Setup
169
162
########################
170
163
 
171
 
from tools.build_mo import build_mo
172
 
 
173
164
command_classes = {'install_scripts': my_install_scripts,
174
 
                   'build': bzr_build,
175
 
                   'build_mo': build_mo,
176
 
                   }
 
165
                   'build': bzr_build}
177
166
from distutils import log
178
167
from distutils.errors import CCompilerError, DistutilsPlatformError
179
168
from distutils.extension import Extension
180
169
ext_modules = []
181
170
try:
182
171
    try:
 
172
        from Pyrex.Distutils import build_ext
 
173
        from Pyrex.Compiler.Version import version as pyrex_version
 
174
    except ImportError:
 
175
        print("No Pyrex, trying Cython...")
183
176
        from Cython.Distutils import build_ext
184
177
        from Cython.Compiler.Version import version as pyrex_version
185
 
    except ImportError:
186
 
        print("No Cython, trying Pyrex...")
187
 
        from Pyrex.Distutils import build_ext
188
 
        from Pyrex.Compiler.Version import version as pyrex_version
189
178
except ImportError:
190
179
    have_pyrex = False
191
180
    # try to build the extension from the prior generated source.
300
289
        # The code it generates re-uses a "local" pointer and
301
290
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
302
291
        # which is NULL safe with PY_DECREF which is not.)
303
 
        # <https://bugs.launchpad.net/bzr/+bug/449372>
304
 
        # <https://bugs.launchpad.net/bzr/+bug/276868>
 
292
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
 
293
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
305
294
        print('Cannot build extension "bzrlib._dirstate_helpers_pyx" using')
306
 
        print('your version of pyrex "%s". Please upgrade your pyrex'
307
 
              % (pyrex_version,))
 
295
        print('your version of pyrex "%s". Please upgrade your pyrex' % (
 
296
            pyrex_version,))
308
297
        print('install. For now, the non-compiled (python) version will')
309
298
        print('be used instead.')
310
299
    else:
404
393
    # ditto for the tbzrcommand tool
405
394
    tbzrcommand = dict(
406
395
        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
407
 
        icon_resources = icon_resources,
408
 
        other_resources = other_resources,
 
396
        icon_resources = [(0,'bzr.ico')],
409
397
    )
410
398
    console_targets.append(tbzrcommand)
411
399
    tbzrcommandw = tbzrcommand.copy()
425
413
 
426
414
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
427
415
    # PyQt4 itself still escapes the plugin detection code for some reason...
428
 
    includes.append('PyQt4.QtCore')
429
 
    includes.append('PyQt4.QtGui')
 
416
    packages.append('PyQt4')
 
417
    excludes.append('PyQt4.elementtree.ElementTree')
 
418
    excludes.append('PyQt4.uic.port_v3')
430
419
    includes.append('sip') # extension module required for Qt.
431
420
    packages.append('pygments') # colorizer for qbzr
432
421
    packages.append('docutils') # html formatting
433
422
    includes.append('win32event')  # for qsubprocess stuff
 
423
    # but we can avoid many Qt4 Dlls.
 
424
    dll_excludes.extend(
 
425
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
 
426
        QtHelp4.dll QtNetwork4.dll QtOpenGL4.dll QtScript4.dll
 
427
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
 
428
        qscintilla2.dll""".split())
434
429
    # the qt binaries might not be on PATH...
435
430
    # They seem to install to a place like C:\Python25\PyQt4\*
436
431
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
478
473
    packages.append('sqlite3')
479
474
 
480
475
 
481
 
def get_fastimport_py2exe_info(includes, excludes, packages):
482
 
    # This is the python-fastimport package, not to be confused with the
483
 
    # bzr-fastimport plugin.
484
 
    packages.append('fastimport')
485
 
 
486
 
 
487
476
if 'bdist_wininst' in sys.argv:
488
477
    def find_docs():
489
478
        docs = []
508
497
            # help pages
509
498
            'data_files': find_docs(),
510
499
            # for building pyrex extensions
511
 
            'cmdclass': command_classes,
 
500
            'cmdclass': {'build_ext': build_ext_if_possible},
512
501
           }
513
502
 
514
503
    ARGS.update(META_INFO)
515
504
    ARGS.update(BZRLIB)
516
505
    ARGS.update(PKG_DATA)
517
 
 
 
506
    
518
507
    setup(**ARGS)
519
508
 
520
509
elif 'py2exe' in sys.argv:
549
538
            #                time before living with docstring stripping
550
539
            optimize = 1
551
540
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
552
 
            # Round mtime to nearest even second so that installing on a FAT
553
 
            # filesystem bytecode internal and script timestamps will match
554
 
            for f in compile_names:
555
 
                mtime = os.stat(f).st_mtime
556
 
                remainder = mtime % 2
557
 
                if remainder:
558
 
                    mtime -= remainder
559
 
                    os.utime(f, (mtime, mtime))
560
541
            byte_compile(compile_names,
561
542
                         optimize=optimize,
562
543
                         force=self.force, prefix=self.install_dir,
575
556
                                     company_name = "Canonical Ltd.",
576
557
                                     comments = META_INFO['description'],
577
558
                                    )
578
 
    gui_target = copy.copy(target)
579
 
    gui_target.dest_base = "bzrw"
580
559
 
581
560
    packages = BZRLIB['packages']
582
561
    packages.remove('bzrlib')
667
646
    console_targets = [target,
668
647
                       'tools/win32/bzr_postinstall.py',
669
648
                       ]
670
 
    gui_targets = [gui_target]
 
649
    gui_targets = []
671
650
    data_files = topics_files + plugins_files
672
651
 
673
652
    if 'qbzr' in plugins:
676
655
    if 'svn' in plugins:
677
656
        get_svn_py2exe_info(includes, excludes, packages)
678
657
 
679
 
    if 'fastimport' in plugins:
680
 
        get_fastimport_py2exe_info(includes, excludes, packages)
681
 
 
682
658
    if "TBZR" in os.environ:
683
659
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
684
660
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
708
684
 
709
685
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
710
686
    # in on Vista.
711
 
    dll_excludes.extend(["MSWSOCK.dll",
712
 
                         "MSVCP60.dll",
713
 
                         "MSVCP90.dll",
714
 
                         "powrprof.dll",
715
 
                         "SHFOLDER.dll"])
 
687
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
716
688
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
717
689
                               "includes": includes,
718
690
                               "excludes": excludes,
719
691
                               "dll_excludes": dll_excludes,
720
692
                               "dist_dir": "win32_bzr.exe",
721
693
                               "optimize": 2,
722
 
                               "custom_boot_script":
723
 
                                        "tools/win32/py2exe_boot_common.py",
724
694
                              },
725
695
                   }
726
 
 
727
 
    # We want the libaray.zip to have optimize = 2, but the exe to have
728
 
    # optimize = 1, so that .py files that get compilied at run time
729
 
    # (e.g. user installed plugins) dont have their doc strings removed.
730
 
    class py2exe_no_oo_exe(py2exe.build_exe.py2exe):
731
 
        def build_executable(self, *args, **kwargs):
732
 
            self.optimize = 1
733
 
            py2exe.build_exe.py2exe.build_executable(self, *args, **kwargs)
734
 
            self.optimize = 2
735
 
 
736
696
    if __name__ == '__main__':
737
 
        command_classes['install_data'] = install_data_with_bytecompile
738
 
        command_classes['py2exe'] = py2exe_no_oo_exe
739
697
        setup(options=options_list,
740
698
              console=console_targets,
741
699
              windows=gui_targets,
742
700
              zipfile='lib/library.zip',
743
701
              data_files=data_files,
744
 
              cmdclass=command_classes,
 
702
              cmdclass={'install_data': install_data_with_bytecompile},
745
703
              )
746
704
 
747
705
else:
752
710
        # easy_install one
753
711
        DATA_FILES = [('man/man1', ['bzr.1'])]
754
712
 
 
713
    if sys.platform != 'win32':
 
714
        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
 
715
        #
 
716
        # checking the paths and hardcoding the check for root is a bit gross,
 
717
        # but I don't see a cleaner way to find out the locations in a way
 
718
        # that's going to align with the hardcoded paths in apport.
 
719
        if os.geteuid() == 0:
 
720
            DATA_FILES += [
 
721
                ('/usr/share/apport/package-hooks',
 
722
                    ['apport/source_bzr.py']),
 
723
                ('/etc/apport/crashdb.conf.d/',
 
724
                    ['apport/bzr-crashdb.conf']),]
 
725
 
755
726
    # std setup
756
727
    ARGS = {'scripts': ['bzr'],
757
728
            'data_files': DATA_FILES,