← 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-01-18 07:00:11 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100118070011-zu374wvd0lcgai5a
Move news_merge plugin from contrib to bzrlib/plugins, change it to be enabled via a 'news_merge_files' config option, move more code out of the __init__ to minimise overhead, and add lots of docstrings, add NEWS entry.

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
13
if sys.version_info < (2, 4):
15
14
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
38
37
    'version':      bzrlib.__version__,
39
38
    'author':       'Canonical Ltd',
40
39
    'author_email': 'bazaar@lists.canonical.com',
41
 
    'url':          'http://bazaar.canonical.com/',
 
40
    'url':          'http://www.bazaar-vcs.org/',
42
41
    'description':  'Friendly distributed version control system',
43
42
    'license':      'GNU GPL v2',
44
43
    'download_url': 'https://launchpad.net/bzr/+download',
126
125
                f = file(batch_path, "w")
127
126
                f.write(batch_str)
128
127
                f.close()
129
 
                print("Created: %s" % batch_path)
130
 
            except Exception:
131
 
                e = sys.exc_info()[1]
132
 
                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)
133
131
 
134
132
    def _quoted_path(self, path):
135
133
        if ' ' in path:
173
171
        from Pyrex.Distutils import build_ext
174
172
        from Pyrex.Compiler.Version import version as pyrex_version
175
173
    except ImportError:
176
 
        print("No Pyrex, trying Cython...")
 
174
        print "No Pyrex, trying Cython..."
177
175
        from Cython.Distutils import build_ext
178
176
        from Cython.Compiler.Version import version as pyrex_version
179
177
except ImportError:
180
178
    have_pyrex = False
181
179
    # try to build the extension from the prior generated source.
182
 
    print("")
183
 
    print("The python package 'Pyrex' is not available."
184
 
          " If the .c files are available,")
185
 
    print("they will be built,"
186
 
          " but modifying the .pyx files will not rebuild them.")
187
 
    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
188
186
    from distutils.command.build_ext import build_ext
189
187
else:
190
188
    have_pyrex = True
191
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
192
189
 
193
190
 
194
191
class build_ext_if_possible(build_ext):
206
203
    def run(self):
207
204
        try:
208
205
            build_ext.run(self)
209
 
        except DistutilsPlatformError:
210
 
            e = sys.exc_info()[1]
 
206
        except DistutilsPlatformError, e:
211
207
            if not self.allow_python_fallback:
212
208
                log.warn('\n  Cannot build extensions.\n'
213
209
                         '  Use "build_ext --allow-python-fallback" to use'
284
280
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
285
281
                        libraries=['Ws2_32'])
286
282
    add_pyrex_extension('bzrlib._walkdirs_win32')
 
283
    z_lib = 'zdll'
287
284
else:
288
 
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
 
285
    if have_pyrex and pyrex_version.startswith('0.9.4'):
289
286
        # Pyrex 0.9.4.1 fails to compile this extension correctly
290
287
        # The code it generates re-uses a "local" pointer and
291
288
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
292
289
        # which is NULL safe with PY_DECREF which is not.)
293
290
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
294
291
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
295
 
        print('Cannot build extension "bzrlib._dirstate_helpers_pyx" using')
296
 
        print('your version of pyrex "%s". Please upgrade your pyrex' % (
297
 
            pyrex_version,))
298
 
        print('install. For now, the non-compiled (python) version will')
299
 
        print('be used instead.')
 
292
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
 
293
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
 
294
            pyrex_version,)
 
295
        print 'install. For now, the non-compiled (python) version will'
 
296
        print 'be used instead.'
300
297
    else:
301
298
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
302
299
    add_pyrex_extension('bzrlib._readdir_pyx')
303
 
add_pyrex_extension('bzrlib._chk_map_pyx')
 
300
    z_lib = 'z'
 
301
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
304
302
ext_modules.append(Extension('bzrlib._patiencediff_c',
305
303
                             ['bzrlib/_patiencediff_c.c']))
306
 
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
307
 
    print("")
308
 
    print('Your Pyrex/Cython version %s is too old to build the simple_set' % (
309
 
        pyrex_version))
310
 
    print('and static_tuple extensions.')
311
 
    print('Please upgrade to at least Pyrex 0.9.6.3')
312
 
    print("")
313
 
    # TODO: Should this be a fatal error?
314
 
else:
315
 
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
316
 
    # on simple_set
317
 
    add_pyrex_extension('bzrlib._simple_set_pyx')
318
 
    ext_modules.append(Extension('bzrlib._static_tuple_c',
319
 
                                 ['bzrlib/_static_tuple_c.c']))
 
304
add_pyrex_extension('bzrlib._simple_set_pyx')
 
305
ext_modules.append(Extension('bzrlib._static_tuple_c',
 
306
                             ['bzrlib/_static_tuple_c.c']))
320
307
add_pyrex_extension('bzrlib._btree_serializer_pyx')
321
308
 
322
309
 
323
310
if unavailable_files:
324
 
    print('C extension(s) not found:')
325
 
    print('   %s' % ('\n  '.join(unavailable_files),))
326
 
    print('The python versions will be used instead.')
327
 
    print("")
 
311
    print 'C extension(s) not found:'
 
312
    print '   %s' % ('\n  '.join(unavailable_files),)
 
313
    print 'The python versions will be used instead.'
 
314
    print
328
315
 
329
316
 
330
317
def get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
414
401
 
415
402
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
416
403
    # PyQt4 itself still escapes the plugin detection code for some reason...
417
 
    includes.append('PyQt4.QtCore')
418
 
    includes.append('PyQt4.QtGui')
 
404
    packages.append('PyQt4')
 
405
    excludes.append('PyQt4.elementtree.ElementTree')
 
406
    excludes.append('PyQt4.uic.port_v3')
419
407
    includes.append('sip') # extension module required for Qt.
420
408
    packages.append('pygments') # colorizer for qbzr
421
409
    packages.append('docutils') # html formatting
422
410
    includes.append('win32event')  # for qsubprocess stuff
 
411
    # but we can avoid many Qt4 Dlls.
 
412
    dll_excludes.extend(
 
413
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
 
414
        QtHelp4.dll QtNetwork4.dll QtOpenGL4.dll QtScript4.dll
 
415
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
 
416
        qscintilla2.dll""".split())
423
417
    # the qt binaries might not be on PATH...
424
418
    # They seem to install to a place like C:\Python25\PyQt4\*
425
419
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
464
458
 
465
459
def get_svn_py2exe_info(includes, excludes, packages):
466
460
    packages.append('subvertpy')
467
 
    packages.append('sqlite3')
468
461
 
469
462
 
470
463
if 'bdist_wininst' in sys.argv:
528
521
            install_data.run(self)
529
522
 
530
523
            py2exe = self.distribution.get_command_obj('py2exe', False)
531
 
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
532
 
            #                time before living with docstring stripping
533
 
            optimize = 1
 
524
            optimize = py2exe.optimize
534
525
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
535
 
            # Round mtime to nearest even second so that installing on a FAT
536
 
            # filesystem bytecode internal and script timestamps will match
537
 
            for f in compile_names:
538
 
                mtime = os.stat(f).st_mtime
539
 
                remainder = mtime % 2
540
 
                if remainder:
541
 
                    mtime -= remainder
542
 
                    os.utime(f, (mtime, mtime))
543
526
            byte_compile(compile_names,
544
527
                         optimize=optimize,
545
528
                         force=self.force, prefix=self.install_dir,
546
529
                         dry_run=self.dry_run)
547
 
            self.outfiles.extend([f + 'o' for f in compile_names])
 
530
            if optimize:
 
531
                suffix = 'o'
 
532
            else:
 
533
                suffix = 'c'
 
534
            self.outfiles.extend([f + suffix for f in compile_names])
548
535
    # end of class install_data_with_bytecompile
549
536
 
550
537
    target = py2exe.build_exe.Target(script = "bzr",
554
541
                                     version = version_str,
555
542
                                     description = META_INFO['description'],
556
543
                                     author = META_INFO['author'],
557
 
                                     copyright = "(c) Canonical Ltd, 2005-2010",
 
544
                                     copyright = "(c) Canonical Ltd, 2005-2009",
558
545
                                     company_name = "Canonical Ltd.",
559
546
                                     comments = META_INFO['description'],
560
547
                                    )
561
 
    gui_target = copy.copy(target)
562
 
    gui_target.dest_base = "bzrw"
563
548
 
564
549
    packages = BZRLIB['packages']
565
550
    packages.remove('bzrlib')
575
560
    if sys.version.startswith('2.4'):
576
561
        # adding elementtree package
577
562
        additional_packages.add('elementtree')
578
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
563
    elif sys.version.startswith('2.5'):
579
564
        additional_packages.add('xml.etree')
580
565
    else:
581
566
        import warnings
627
612
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
628
613
        x = []
629
614
        for i in files:
630
 
            # Throw away files we don't want packaged. Note that plugins may
631
 
            # have data files with all sorts of extensions so we need to
632
 
            # be conservative here about what we ditch.
633
 
            ext = os.path.splitext(i)[1]
634
 
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
 
615
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
635
616
                continue
636
617
            if i == '__init__.py' and root == 'bzrlib/plugins':
637
618
                continue
650
631
    console_targets = [target,
651
632
                       'tools/win32/bzr_postinstall.py',
652
633
                       ]
653
 
    gui_targets = [gui_target]
 
634
    gui_targets = []
654
635
    data_files = topics_files + plugins_files
655
636
 
656
637
    if 'qbzr' in plugins:
683
664
        # print this warning to stderr as output is redirected, so it is seen
684
665
        # at build time.  Also to stdout so it appears in the log
685
666
        for f in (sys.stderr, sys.stdout):
686
 
            f.write("Skipping TBZR binaries - "
687
 
                "please set TBZR to a directory to enable\n")
 
667
            print >> f, \
 
668
                "Skipping TBZR binaries - please set TBZR to a directory to enable"
688
669
 
689
670
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
690
671
    # in on Vista.
694
675
                               "excludes": excludes,
695
676
                               "dll_excludes": dll_excludes,
696
677
                               "dist_dir": "win32_bzr.exe",
697
 
                               "optimize": 2,
698
 
                               "custom_boot_script":
699
 
                                        "tools/win32/py2exe_boot_common.py",
 
678
                               "optimize": 1,
700
679
                              },
701
680
                   }
702
681
 
703
 
    # We want the libaray.zip to have optimize = 2, but the exe to have
704
 
    # optimize = 1, so that .py files that get compilied at run time
705
 
    # (e.g. user installed plugins) dont have their doc strings removed.
706
 
    class py2exe_no_oo_exe(py2exe.build_exe.py2exe):
707
 
        def build_executable(self, *args, **kwargs):
708
 
            self.optimize = 1
709
 
            py2exe.build_exe.py2exe.build_executable(self, *args, **kwargs)
710
 
            self.optimize = 2
711
 
 
712
 
    if __name__ == '__main__':
713
 
        setup(options=options_list,
714
 
              console=console_targets,
715
 
              windows=gui_targets,
716
 
              zipfile='lib/library.zip',
717
 
              data_files=data_files,
718
 
              cmdclass={'install_data': install_data_with_bytecompile,
719
 
                        'py2exe': py2exe_no_oo_exe},
720
 
              )
 
682
    setup(options=options_list,
 
683
          console=console_targets,
 
684
          windows=gui_targets,
 
685
          zipfile='lib/library.zip',
 
686
          data_files=data_files,
 
687
          cmdclass={'install_data': install_data_with_bytecompile},
 
688
          )
721
689
 
722
690
else:
723
691
    # ad-hoc for easy_install
727
695
        # easy_install one
728
696
        DATA_FILES = [('man/man1', ['bzr.1'])]
729
697
 
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
698
    # std setup
744
699
    ARGS = {'scripts': ['bzr'],
745
700
            'data_files': DATA_FILES,
751
706
    ARGS.update(BZRLIB)
752
707
    ARGS.update(PKG_DATA)
753
708
 
754
 
    if __name__ == '__main__':
755
 
        setup(**ARGS)
 
709
    setup(**ARGS)