Changeset 4026

Timestamp:

10/17/08 17:52:12 (3 months ago)

Author:

andar

Message:

Deluge will now use a system libtorrent library if available.

Files:

• branches/1.0.0_RC/ChangeLog (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/alertmanager.py (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/autoadd.py (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/core.py (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/oldstateupgrader.py (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/torrent.py (modified) (1 diff)
• branches/1.0.0_RC/deluge/core/torrentmanager.py (modified) (1 diff)
• branches/1.0.0_RC/deluge/ui/gtkui/addtorrentdialog.py (modified) (1 diff)
• branches/1.0.0_RC/setup.py (modified) (1 diff)
• trunk/deluge/core/autoadd.py (modified) (1 diff)
• trunk/deluge/core/core.py (modified) (1 diff)
• trunk/deluge/core/oldstateupgrader.py (modified) (1 diff)
• trunk/deluge/core/preferencesmanager.py (modified) (1 diff)
• trunk/deluge/core/torrent.py (modified) (1 diff)
• trunk/deluge/core/torrentmanager.py (modified) (1 diff)
• trunk/setup.py (modified) (2 diffs)

branches/1.0.0_RC/ChangeLog

@@ -9 +9 @@
 
  WebUI:
- * Fix White template for Opera
+  * Fix White template for Opera
+ 
+ Misc:
+  * Deluge will now use a system libtorrent library if available.
+  * The build system will no longer build libtorrent if a system library is
+    detected.
 
 Deluge 1.0.2 (10 October 2008)

branches/1.0.0_RC/deluge/core/alertmanager.py

@@ -37 +37 @@
 
 import deluge.component as component
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 from deluge.log import LOG as log
 

branches/1.0.0_RC/deluge/core/autoadd.py

@@ -34 +34 @@
 import os
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 import deluge.component as component
 from deluge.configmanager import ConfigManager

branches/1.0.0_RC/deluge/core/core.py

@@ -47 +47 @@
 import socket
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
+    
 import deluge.configmanager
 import deluge.common

branches/1.0.0_RC/deluge/core/oldstateupgrader.py

@@ -38 +38 @@
 import shutil
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 from deluge.configmanager import ConfigManager
 import deluge.core.torrentmanager

branches/1.0.0_RC/deluge/core/torrent.py

@@ -36 +36 @@
 import os
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 import deluge.common
 import deluge.component as component

branches/1.0.0_RC/deluge/core/torrentmanager.py

@@ -41 +41 @@
 import gobject
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 
 import deluge.common

branches/1.0.0_RC/deluge/ui/gtkui/addtorrentdialog.py

@@ -180 +180 @@
                 
     def add_from_files(self, filenames):
-        import deluge.libtorrent as lt
+        try:
+            import libtorrent as lt
+        except ImportError:
+            import deluge.libtorrent as lt
         import os.path
         new_row = None

branches/1.0.0_RC/setup.py

@@ -166 +166 @@
             break
 
-libtorrent = Extension(
-    'libtorrent',
-    extra_compile_args = _extra_compile_args,
-    include_dirs = _include_dirs,
-    libraries = _libraries,
-    library_dirs = _library_dirs,
-    sources = _sources
-)
+_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,
+        include_dirs = _include_dirs,
+        libraries = _libraries,
+        library_dirs = _library_dirs,
+        sources = _sources
+    )
+    
+    _ext_modules = [libtorrent]
 
 class build_trans(cmd.Command):

trunk/deluge/core/autoadd.py

@@ -34 +34 @@
 import os
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 import deluge.component as component
 from deluge.configmanager import ConfigManager

trunk/deluge/core/core.py

@@ -47 +47 @@
 import socket
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 import deluge.configmanager
 import deluge.common

trunk/deluge/core/oldstateupgrader.py

@@ -38 +38 @@
 import shutil
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 from deluge.configmanager import ConfigManager
 import deluge.core.torrentmanager

trunk/deluge/core/preferencesmanager.py

@@ -36 +36 @@
 import gobject
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 import deluge.configmanager
 import deluge.common

trunk/deluge/core/torrent.py

@@ -37 +37 @@
 from urlparse import urlparse
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 import deluge.common
 import deluge.component as component

trunk/deluge/core/torrentmanager.py

@@ -41 +41 @@
 import gobject
 
-import deluge.libtorrent as lt
+try:
+    import libtorrent as lt
+except ImportError:
+    import deluge.libtorrent as lt
 
 import deluge.common

trunk/setup.py

@@ -189 +189 @@
             break
 
-libtorrent = Extension(
-    'libtorrent',
-    extra_compile_args = _extra_compile_args,
-    include_dirs = _include_dirs,
-    libraries = _libraries,
-    library_dirs = _library_dirs,
-    sources = _sources
-)
+_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,
+        include_dirs = _include_dirs,
+        libraries = _libraries,
+        library_dirs = _library_dirs,
+        sources = _sources
+    )
+    
+    _ext_modules = [libtorrent]
 
 class build_trans(cmd.Command):
@@ -299 +304 @@
     """,
     ext_package = "deluge",
-    ext_modules = [libtorrent],
+    ext_modules = _ext_modules,
     fullname = "Deluge Bittorent Client",
     include_package_data = True,