Author: andar
Revision: 5860
Log:
Update some files from trunk
Diff:
Modified: branches/lt-trunk/ez_setup.py
===================================================================
--- branches/lt-trunk/ez_setup.py 2009-10-23 22:08:14 UTC (rev 5859)
+++ branches/lt-trunk/ez_setup.py 2009-10-23 22:28:20 UTC (rev 5860)
@@ -14,20 +14,52 @@
This file can also be run as a script to install or upgrade setuptools.
"""
import sys
-DEFAULT_VERSION = "0.6c8"
-DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/"; %
sys.version[:3]
+DEFAULT_VERSION = "0.6c9"
+DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/"; %
sys.version[:3]
md5_data = {
+ 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
+ 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
+ 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
+ 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
+ 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
+ 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
+ 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
+ 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
+ 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
+ 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
+ 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
+ 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
+ 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
+ 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
+ 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
+ 'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
+ 'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
+ 'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
+ 'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
+ 'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
+ 'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
+ 'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
+ 'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
+ 'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
+ 'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
+ 'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
+ 'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+ 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+ 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
+ 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03',
+ 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
}
import sys, os
+try: from hashlib import md5
+except ImportError: from md5 import md5
def _validate_md5(egg_name, data):
if egg_name in md5_data:
- from md5 import md5
digest = md5(data).hexdigest()
if digest != md5_data[egg_name]:
print >>sys.stderr, (
@@ -37,7 +69,6 @@
sys.exit(2)
return data
-
def use_setuptools(
version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
download_delay=15
@@ -53,31 +84,31 @@
this routine will print a message to ``sys.stderr`` and raise SystemExit in
an attempt to abort the calling script.
"""
- try:
- import setuptools
- if setuptools.__version__ == '0.0.1':
- print >>sys.stderr, (
- "You have an obsolete version of setuptools installed. Please\n"
- "remove it from your system entirely before rerunning this script."
- )
- sys.exit(2)
- except ImportError:
+ was_imported = 'pkg_resources' in sys.modules or 'setuptools' in
sys.modules
+ def do_download():
egg = download_setuptools(version, download_base, to_dir,
download_delay)
sys.path.insert(0, egg)
import setuptools; setuptools.bootstrap_install_from = egg
-
- import pkg_resources
try:
- pkg_resources.require("setuptools>="+version)
-
+ import pkg_resources
+ except ImportError:
+ return do_download()
+ try:
+ pkg_resources.require("setuptools>="+version); return
except pkg_resources.VersionConflict, e:
- # XXX could we install in a subprocess here?
- print >>sys.stderr, (
+ if was_imported:
+ print >>sys.stderr, (
"The required version of setuptools (>=%s) is not available, and\n"
"can't be installed while this script is running. Please install\n"
- " a more recent version first.\n\n(Currently using %r)"
- ) % (version, e.args[0])
- sys.exit(2)
+ " a more recent version first, using 'easy_install -U setuptools'."
+ "\n\n(Currently using %r)"
+ ) % (version, e.args[0])
+ sys.exit(2)
+ else:
+ del pkg_resources, sys.modules['pkg_resources'] # reload ok
+ return do_download()
+ except pkg_resources.DistributionNotFound:
+ return do_download()
def download_setuptools(
version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
@@ -126,9 +157,43 @@
if dst: dst.close()
return os.path.realpath(saveto)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
def main(argv, version=DEFAULT_VERSION):
"""Install or upgrade setuptools and EasyInstall"""
-
try:
import setuptools
except ImportError:
@@ -143,8 +208,11 @@
os.unlink(egg)
else:
if setuptools.__version__ == '0.0.1':
- # tell the user to uninstall obsolete version
- use_setuptools(version)
+ print >>sys.stderr, (
+ "You have an obsolete version of setuptools installed. Please\n"
+ "remove it from your system entirely before rerunning this script."
+ )
+ sys.exit(2)
req = "setuptools>="+version
import pkg_resources
@@ -165,13 +233,10 @@
print "Setuptools version",version,"or greater has been installed."
print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-
def update_md5(filenames):
"""Update our built-in md5 registry"""
import re
- from md5 import md5
for name in filenames:
base = os.path.basename(name)
@@ -208,3 +273,4 @@
+
Modified: branches/lt-trunk/setup.py
===================================================================
--- branches/lt-trunk/setup.py 2009-10-23 22:08:14 UTC (rev 5859)
+++ branches/lt-trunk/setup.py 2009-10-23 22:28:20 UTC (rev 5860)
@@ -30,7 +30,13 @@
from distutils.command.build import build as _build
from distutils.command.clean import clean as _clean
from setuptools.command.install import install as _install
+try:
+ from sphinx.setup_command import BuildDoc
+except ImportError:
+ class BuildDoc(object):
+ pass
+
import msgfmt
import os
import platform
@@ -195,14 +201,13 @@
# Check for a system libtorrent and if found, then do not build the libtorrent
extension
build_libtorrent = True
try:
- import libtorrent
+ from deluge._libtorrent import lt
except ImportError:
build_libtorrent = True
else:
- if libtorrent.version_major == 0 and libtorrent.version_minor == 14:
- build_libtorrent = False
+ build_libtorrent = False
-if build_libtorrent:
+if build_libtorrent and os.path.exists("libtorrent"):
# There isn't a system libtorrent library, so let's build the one included
with deluge
libtorrent = Extension(
'libtorrent',
@@ -269,6 +274,34 @@
if os.path.exists(os.path.join(path, "setup.py")):
os.system("cd " + path + "&& " + sys.executable + " setup.py
bdist_egg -d ..")
+
+class build_docs(BuildDoc):
+ def run(self):
+ class FakeModule(object):
+ def __init__(self, *args, **kwargs): pass
+
+ def __call__(self, *args, **kwargs):
+ return FakeModule()
+
+ def __getattr__(self, key):
+ return FakeModule()
+
+ def __setattr__(self, key, value):
+ self.__dict__[key] = value
+
+ old_import = __builtins__.__import__
+ def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
+ try:
+ return old_import(name, globals, locals, fromlist, level)
+ except ImportError:
+ return FakeModule()
+ except Exception, e:
+ print "Skipping Exception: ", e
+ return FakeModule()
+ __builtins__.__import__ = new_import
+
+ BuildDoc.run(self)
+
class build(_build):
sub_commands = [('build_trans', None), ('build_plugins', None)] +
_build.sub_commands
def run(self):
@@ -326,6 +359,7 @@
'build': build,
'build_trans': build_trans,
'build_plugins': build_plugins,
+ 'build_docs': build_docs,
'clean_plugins': clean_plugins,
'clean': clean,
'install': install
@@ -348,13 +382,17 @@
('share/icons/hicolor/96x96/apps',
['deluge/data/icons/hicolor/96x96/apps/deluge.png']),
('share/applications', ['deluge/data/share/applications/deluge.desktop']),
('share/pixmaps', ['deluge/data/pixmaps/deluge.png',
'deluge/data/pixmaps/deluge.xpm']),
- ('share/man/man1', ['deluge/docs/man/deluge.1',
'deluge/docs/man/deluged.1'])
+ ('share/man/man1', [
+ 'docs/man/deluge.1',
+ 'docs/man/deluged.1',
+ 'docs/man/deluge-gtk.1',
+ 'docs/man/deluge-console.1'])
]
# Main setup
setup(
- author = "Andrew Resch, Marcos Pinto, Martijn Voncken, Damien Churchill",
- author_email = "[email protected], [email protected],
[email protected], [email protected]",
+ author = "Andrew Resch, Damien Churchill",
+ author_email = "[email protected], [email protected]",
cmdclass = cmdclass,
data_files = _data_files,
description = "Bittorrent Client",
@@ -391,12 +429,13 @@
"ui/web/index.html",
"ui/web/css/*.css",
"ui/web/icons/*.png",
+ "ui/web/images/*.gif",
"ui/web/images/*.png",
"ui/web/js/*.js",
"ui/web/render/*.html",
"ui/web/themes/*/*/*"
]},
- packages = find_packages(exclude=["plugins"]),
+ packages = find_packages(exclude=["plugins", "docs", "tests"]),
url = "http://deluge-torrent.org";,
- version = "1.2.0",
+ version = "1.3.0",
)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
