Deluge will now use a system libtorrent library if available.

This commit is contained in:
Andrew Resch 2008-10-17 17:52:12 +00:00
commit 86d1624cff
7 changed files with 38 additions and 15 deletions

View file

@ -33,6 +33,9 @@
import os
try:
import libtorrent as lt
except ImportError:
import deluge.libtorrent as lt
import deluge.component as component
from deluge.configmanager import ConfigManager

View file

@ -46,6 +46,9 @@ import gobject
import threading
import socket
try:
import libtorrent as lt
except ImportError:
import deluge.libtorrent as lt
import deluge.configmanager
import deluge.common

View file

@ -37,6 +37,9 @@ import pickle
import cPickle
import shutil
try:
import libtorrent as lt
except ImportError:
import deluge.libtorrent as lt
from deluge.configmanager import ConfigManager
import deluge.core.torrentmanager

View file

@ -35,6 +35,9 @@ import os.path
import threading
import gobject
try:
import libtorrent as lt
except ImportError:
import deluge.libtorrent as lt
import deluge.configmanager
import deluge.common

View file

@ -36,6 +36,9 @@
import os
from urlparse import urlparse
try:
import libtorrent as lt
except ImportError:
import deluge.libtorrent as lt
import deluge.common
import deluge.component as component

View file

@ -40,6 +40,9 @@ import time
import gobject
try:
import libtorrent as lt
except ImportError:
import deluge.libtorrent as lt
import deluge.common

View file

@ -188,6 +188,9 @@ for source in _sources:
_sources.remove(source)
break
_ext_modules = []
if not os.path.exists(os.path.join(sysconfig.get_config_var("LIBDIR"), "libtorrent-rasterbar.so.1")):
# There isn't a system libtorrent library, so let's build the one included with deluge
libtorrent = Extension(
'libtorrent',
extra_compile_args = _extra_compile_args,
@ -197,6 +200,8 @@ libtorrent = Extension(
sources = _sources
)
_ext_modules = [libtorrent]
class build_trans(cmd.Command):
description = 'Compile .po files into .mo files'
@ -298,7 +303,7 @@ setup(
deluged = deluge.main:start_daemon
""",
ext_package = "deluge",
ext_modules = [libtorrent],
ext_modules = _ext_modules,
fullname = "Deluge Bittorent Client",
include_package_data = True,
license = "GPLv3",