← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

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
 
128
125
                f = file(batch_path, "w")
129
126
                f.write(batch_str)
130
127
                f.close()
131
 
                print("Created: %s" % batch_path)
132
 
            except Exception:
133
 
                e = sys.exc_info()[1]
134
 
                print("ERROR: Unable to create %s: %s" % (batch_path, e))
 
128
                print "Created:", batch_path
 
129
            except Exception, e:
 
130
                print "ERROR: Unable to create %s: %s" % (batch_path, e)
135
131
 
136
132
    def _quoted_path(self, path):
137
133
        if ' ' in path:
153
149
    Generate bzr.1.
154
150
    """
155
151
 
156
 
    sub_commands = build.sub_commands + [
157
 
            ('build_mo', lambda _: True),
158
 
            ]
159
 
 
160
152
    def run(self):
161
153
        build.run(self)
162
154
 
168
160
## Setup
169
161
########################
170
162
 
171
 
from tools.build_mo import build_mo
172
 
 
173
163
command_classes = {'install_scripts': my_install_scripts,
174
 
                   'build': bzr_build,
175
 
                   'build_mo': build_mo,
176
 
                   }
 
164
                   'build': bzr_build}
177
165
from distutils import log
178
166
from distutils.errors import CCompilerError, DistutilsPlatformError
179
167
from distutils.extension import Extension
180
168
ext_modules = []
181
169
try:
182
170
    try:
 
171
        from Pyrex.Distutils import build_ext
 
172
        from Pyrex.Compiler.Version import version as pyrex_version
 
173
    except ImportError:
 
174
        print "No Pyrex, trying Cython..."
183
175
        from Cython.Distutils import build_ext
184
176
        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
177
except ImportError:
190
178
    have_pyrex = False
191
179
    # try to build the extension from the prior generated source.
192
 
    print("")
193
 
    print("The python package 'Pyrex' is not available."
194
 
          " If the .c files are available,")
195
 
    print("they will be built,"
196
 
          " but modifying the .pyx files will not rebuild them.")
197
 
    print("")
 
180
    print
 
181
    print ("The python package 'Pyrex' is not available."
 
182
           " If the .c files are available,")
 
183
    print ("they will be built,"
 
184
           " but modifying the .pyx files will not rebuild them.")
 
185
    print
198
186
    from distutils.command.build_ext import build_ext
199
187
else:
200
188
    have_pyrex = True
216
204
    def run(self):
217
205
        try:
218
206
            build_ext.run(self)
219
 
        except DistutilsPlatformError:
220
 
            e = sys.exc_info()[1]
 
207
        except DistutilsPlatformError, e:
221
208
            if not self.allow_python_fallback:
222
209
                log.warn('\n  Cannot build extensions.\n'
223
210
                         '  Use "build_ext --allow-python-fallback" to use'
294
281
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
295
282
                        libraries=['Ws2_32'])
296
283
    add_pyrex_extension('bzrlib._walkdirs_win32')
 
284
    z_lib = 'zdll'
297
285
else:
298
286
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
299
287
        # Pyrex 0.9.4.1 fails to compile this extension correctly
300
288
        # The code it generates re-uses a "local" pointer and
301
289
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
302
290
        # 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>
305
 
        print('Cannot build extension "bzrlib._dirstate_helpers_pyx" using')
306
 
        print('your version of pyrex "%s". Please upgrade your pyrex'
307
 
              % (pyrex_version,))
308
 
        print('install. For now, the non-compiled (python) version will')
309
 
        print('be used instead.')
 
291
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
 
292
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
 
293
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
 
294
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
 
295
            pyrex_version,)
 
296
        print 'install. For now, the non-compiled (python) version will'
 
297
        print 'be used instead.'
310
298
    else:
311
299
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
312
300
    add_pyrex_extension('bzrlib._readdir_pyx')
313
 
add_pyrex_extension('bzrlib._chk_map_pyx')
 
301
    z_lib = 'z'
 
302
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
314
303
ext_modules.append(Extension('bzrlib._patiencediff_c',
315
304
                             ['bzrlib/_patiencediff_c.c']))
316
305
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
317
 
    print("")
318
 
    print('Your Pyrex/Cython version %s is too old to build the simple_set' % (
319
 
        pyrex_version))
320
 
    print('and static_tuple extensions.')
321
 
    print('Please upgrade to at least Pyrex 0.9.6.3')
322
 
    print("")
 
306
    print
 
307
    print 'Your Pyrex/Cython version %s is too old to build the simple_set' % (
 
308
        pyrex_version)
 
309
    print 'and static_tuple extensions.'
 
310
    print 'Please upgrade to at least Pyrex 0.9.6.3'
 
311
    print
323
312
    # TODO: Should this be a fatal error?
324
313
else:
325
314
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
331
320
 
332
321
 
333
322
if unavailable_files:
334
 
    print('C extension(s) not found:')
335
 
    print('   %s' % ('\n  '.join(unavailable_files),))
336
 
    print('The python versions will be used instead.')
337
 
    print("")
 
323
    print 'C extension(s) not found:'
 
324
    print '   %s' % ('\n  '.join(unavailable_files),)
 
325
    print 'The python versions will be used instead.'
 
326
    print
338
327
 
339
328
 
340
329
def get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
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
475
470
 
476
471
def get_svn_py2exe_info(includes, excludes, packages):
477
472
    packages.append('subvertpy')
478
 
    packages.append('sqlite3')
479
 
 
480
 
 
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
473
 
486
474
 
487
475
if 'bdist_wininst' in sys.argv:
508
496
            # help pages
509
497
            'data_files': find_docs(),
510
498
            # for building pyrex extensions
511
 
            'cmdclass': command_classes,
 
499
            'cmdclass': {'build_ext': build_ext_if_possible},
512
500
           }
513
501
 
514
502
    ARGS.update(META_INFO)
515
503
    ARGS.update(BZRLIB)
516
504
    ARGS.update(PKG_DATA)
517
 
 
 
505
    
518
506
    setup(**ARGS)
519
507
 
520
508
elif 'py2exe' in sys.argv:
545
533
            install_data.run(self)
546
534
 
547
535
            py2exe = self.distribution.get_command_obj('py2exe', False)
548
 
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
549
 
            #                time before living with docstring stripping
550
 
            optimize = 1
 
536
            optimize = py2exe.optimize
551
537
            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
538
            byte_compile(compile_names,
561
539
                         optimize=optimize,
562
540
                         force=self.force, prefix=self.install_dir,
563
541
                         dry_run=self.dry_run)
564
 
            self.outfiles.extend([f + 'o' for f in compile_names])
 
542
            if optimize:
 
543
                suffix = 'o'
 
544
            else:
 
545
                suffix = 'c'
 
546
            self.outfiles.extend([f + suffix for f in compile_names])
565
547
    # end of class install_data_with_bytecompile
566
548
 
567
549
    target = py2exe.build_exe.Target(script = "bzr",
575
557
                                     company_name = "Canonical Ltd.",
576
558
                                     comments = META_INFO['description'],
577
559
                                    )
578
 
    gui_target = copy.copy(target)
579
 
    gui_target.dest_base = "bzrw"
580
560
 
581
561
    packages = BZRLIB['packages']
582
562
    packages.remove('bzrlib')
592
572
    if sys.version.startswith('2.4'):
593
573
        # adding elementtree package
594
574
        additional_packages.add('elementtree')
595
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
575
    elif sys.version.startswith('2.5'):
596
576
        additional_packages.add('xml.etree')
597
577
    else:
598
578
        import warnings
667
647
    console_targets = [target,
668
648
                       'tools/win32/bzr_postinstall.py',
669
649
                       ]
670
 
    gui_targets = [gui_target]
 
650
    gui_targets = []
671
651
    data_files = topics_files + plugins_files
672
652
 
673
653
    if 'qbzr' in plugins:
676
656
    if 'svn' in plugins:
677
657
        get_svn_py2exe_info(includes, excludes, packages)
678
658
 
679
 
    if 'fastimport' in plugins:
680
 
        get_fastimport_py2exe_info(includes, excludes, packages)
681
 
 
682
659
    if "TBZR" in os.environ:
683
660
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
684
661
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
703
680
        # print this warning to stderr as output is redirected, so it is seen
704
681
        # at build time.  Also to stdout so it appears in the log
705
682
        for f in (sys.stderr, sys.stdout):
706
 
            f.write("Skipping TBZR binaries - "
707
 
                "please set TBZR to a directory to enable\n")
 
683
            print >> f, \
 
684
                "Skipping TBZR binaries - please set TBZR to a directory to enable"
708
685
 
709
686
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
710
687
    # in on Vista.
711
 
    dll_excludes.extend(["MSWSOCK.dll",
712
 
                         "MSVCP60.dll",
713
 
                         "MSVCP90.dll",
714
 
                         "powrprof.dll",
715
 
                         "SHFOLDER.dll"])
 
688
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
716
689
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
717
690
                               "includes": includes,
718
691
                               "excludes": excludes,
719
692
                               "dll_excludes": dll_excludes,
720
693
                               "dist_dir": "win32_bzr.exe",
721
 
                               "optimize": 2,
722
 
                               "custom_boot_script":
723
 
                                        "tools/win32/py2exe_boot_common.py",
 
694
                               "optimize": 1,
724
695
                              },
725
696
                   }
726
697
 
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
 
    if __name__ == '__main__':
737
 
        command_classes['install_data'] = install_data_with_bytecompile
738
 
        command_classes['py2exe'] = py2exe_no_oo_exe
739
 
        setup(options=options_list,
740
 
              console=console_targets,
741
 
              windows=gui_targets,
742
 
              zipfile='lib/library.zip',
743
 
              data_files=data_files,
744
 
              cmdclass=command_classes,
745
 
              )
 
698
    setup(options=options_list,
 
699
          console=console_targets,
 
700
          windows=gui_targets,
 
701
          zipfile='lib/library.zip',
 
702
          data_files=data_files,
 
703
          cmdclass={'install_data': install_data_with_bytecompile},
 
704
          )
746
705
 
747
706
else:
748
707
    # ad-hoc for easy_install
763
722
    ARGS.update(BZRLIB)
764
723
    ARGS.update(PKG_DATA)
765
724
 
766
 
    if __name__ == '__main__':
767
 
        setup(**ARGS)
 
725
    setup(**ARGS)