sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Check for third party Python modules during configure.

Browse Source 
Inform the user whether the module was found on the system, or if the
bundled copy is being used. If the module is not found, suggest what
they can do to make it available to Samba.

Change-Id: I89ec57a2acf87768ca3714add59575578d2ee399
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Mon Mar 30 13:40:33 CEST 2015 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2015-03-28 16:11:51 +00:00 committed by David Disseldorp
parent e50342f33d
commit c3747f9658
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
third_party/wscript vendored
View File

@ -1,15 +1,52 @@
#!/usr/bin/env python
import Utils
import os
import sys
# work out what python external libraries we need to install
external_libs = {
external_pkgs = {
"dns.resolver": "dnspython/dns",
"iso8601": "pyiso8601/iso8601",
}
def find_third_party_module(conf, module, package):
conf.COMPOUND_START("Checking for third party Python module %s" % module)
try:
__import__(module)
except ImportError:
pass
else:
# Installed on the system
conf.COMPOUND_END("system")
old_path = sys.path
try:
sys.path.append(os.path.join(conf.curdir, os.path.dirname(package)))
try:
__import__(module)
except ImportError:
if (os.path.isdir(os.path.join(conf.srcdir, ".git")) and
os.path.isfile(os.path.join(conf.srcdir, ".gitmodule"))):
raise Utils.WafError("""\
Unable to find Python module '%s'. Please install the system package or check \
out the relevant submodule by running 'git submodule init; git submodule update'.
""" % module)
else:
raise Utils.WafError("""\
Unable to find Python module '%s'. Please install the system package or place a copy in
%s.
""" % (module, package))
else:
conf.COMPOUND_END("bundled")
finally:
sys.path = old_path
def configure(conf):
for module, package in external_pkgs.items():
find_third_party_module(conf, module, package)
conf.RECURSE('popt')
conf.RECURSE('zlib')
@ -17,7 +54,7 @@ def configure(conf):
def build(bld):
list = []
for module, package in external_libs.items():
for module, package in external_pkgs.items():
try:
__import__(module)
except ImportError: