Move configure part of third party to third_party/wscript.

Change-Id: I34875a8bde99df2e0a2659677e88640bb0ec1816 Signed-off-by: Jelmer Vernooij <[email protected]> Reviewed-by: David Disseldorp <[email protected]>
Huoke · Mar 30, 2015 · e50342f · e50342f
1 parent d16c0e3
commit e50342f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 31 deletions.
diff --git a/third_party/wscript b/third_party/wscript
@@ -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')
diff --git a/third_party/wscript_build b/third_party/wscript_build
diff --git a/wscript b/wscript
@@ -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.')