Mercurial > hg-stable
changeset 8283:d6134b800797
setup: cleanup old left-over code
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sun, 03 May 2009 00:41:09 +0200 |
| parents | c214a895f62c |
| children | 36c704b0e7ab |
| files | setup.py |
| diffstat | 1 files changed, 9 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/setup.py Sun May 03 00:20:08 2009 +0200 +++ b/setup.py Sun May 03 00:41:09 2009 +0200 @@ -208,30 +208,20 @@ Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']), Extension('mercurial.mpatch', ['mercurial/mpatch.c']), Extension('mercurial.parsers', ['mercurial/parsers.c']), + Extension('mercurial.osutil', ['mercurial/osutil.c']), ] packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf', ] -try: - import msvcrt - ext_modules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'])) -except ImportError: - pass - -try: - ext_modules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'])) - - if sys.platform == 'linux2' and os.uname()[2] > '2.6': - # The inotify extension is only usable with Linux 2.6 kernels. - # You also need a reasonably recent C library. - cc = new_compiler() - if has_function(cc, 'inotify_add_watch'): - ext_modules.append(Extension('hgext.inotify.linux._inotify', - ['hgext/inotify/linux/_inotify.c'])) - packages.extend(['hgext.inotify', 'hgext.inotify.linux']) -except ImportError: - pass +if sys.platform == 'linux2' and os.uname()[2] > '2.6': + # The inotify extension is only usable with Linux 2.6 kernels. + # You also need a reasonably recent C library. + cc = new_compiler() + if has_function(cc, 'inotify_add_watch'): + ext_modules.append(Extension('hgext.inotify.linux._inotify', + ['hgext/inotify/linux/_inotify.c'])) + packages.extend(['hgext.inotify', 'hgext.inotify.linux']) datafiles = [] for root in ('templates', 'i18n'):