sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

Move configure part of third party to third_party/wscript.

Browse Source 
Change-Id: I34875a8bde99df2e0a2659677e88640bb0ec1816
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Jelmer Vernooij 2015-03-28 15:43:29 +00:00 committed by David Disseldorp
parent d16c0e369e
commit e50342f33d
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
third_party/wscript vendored Normal file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env python
import os
# work out what python external libraries we need to install
external_libs = {
"dns.resolver": "dnspython/dns",
"iso8601": "pyiso8601/iso8601",
}
def configure(conf):
conf.RECURSE('popt')
conf.RECURSE('zlib')
def build(bld):
list = []
for module, package in external_libs.items():
try:
__import__(module)
except ImportError:
list.append(package)
for e in list:
bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/third_party', e + '/**/*', flat=False,
exclude='*.pyc', trim_path=os.path.dirname(e))
bld.SAMBA_GENERATOR('third_party_init_py',
rule='touch ${TGT}',
target='empty_file')
bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/third_party', 'empty_file', destname='__init__.py')
bld.RECURSE('zlib')
bld.RECURSE('popt')

29
third_party/wscript_build vendored
View File

@ -1,29 +0,0 @@
#!/usr/bin/env python
import os
# work out what python external libraries we need to install
external_libs = {
"dns.resolver": "dnspython/dns",
"iso8601": "pyiso8601",
}
list = []
for module, package in external_libs.items():
try:
__import__(module)
except ImportError:
list.append(package)
for e in list:
bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/third_party', e + '/**/*', flat=False,
exclude='*.pyc', trim_path=os.path.dirname(e))
bld.SAMBA_GENERATOR('third_party_init_py',
rule='touch ${TGT}',
target='empty_file')
bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/third_party', 'empty_file', destname='__init__.py')
bld.RECURSE('zlib')
bld.RECURSE('popt')

3
wscript
View File

@ -114,8 +114,7 @@ def configure(conf):
conf.RECURSE('dynconfig')
if conf.CHECK_FOR_THIRD_PARTY():
conf.RECURSE('third_party/zlib')
conf.RECURSE('third_party/popt')
conf.RECURSE('third_party')
else:
if not conf.CHECK_ZLIB():
raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')