s4-waf: create a blank __init__.py in samba/external

needed for the external lib loader

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 789720f0ea63b442498622c8aff19cf18e018476..03325e08db64cc74950587da0d761ffdba19cb39 100644 (file)
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -407,3 +407,8 @@ def IS_NEWER(bld, file1, file2):
     return t1 > t2
 Build.BuildContext.IS_NEWER = IS_NEWER
 
     return t1 > t2
 Build.BuildContext.IS_NEWER = IS_NEWER
 

+
+def TOUCH_FILE(file):
+    '''touch a file'''
+    f = open(file, 'w')
+    f.close()

diff --git a/lib/wscript_build b/lib/wscript_build
index 7424c7f7edc695fdda14e777117b37ac73fee224..b8bc9e9120d7801dade0c16ca5ccb564c6e4566c 100644 (file)
--- a/lib/wscript_build
+++ b/lib/wscript_build
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

-import os
+import os, Options
+from samba_utils import TOUCH_FILE, EXPAND_VARIABLES

 
 # work out what python external libraries we need to install
 external_libs = {
 
 # work out what python external libraries we need to install
 external_libs = {


@@ -19,3 +20,7 @@ for module, package in external_libs.iteritems():
 for e in list:
     bld.INSTALL_WILDCARD('${PYTHONDIR}/samba/external', e + '/**/*', flat=False,
                          exclude='*.pyc', trim_path=os.path.dirname(e))
 for e in list:
     bld.INSTALL_WILDCARD('${PYTHONDIR}/samba/external', e + '/**/*', flat=False,
                          exclude='*.pyc', trim_path=os.path.dirname(e))

+
+if Options.is_install:
+    # we need a blank __init__.py in samba/external
+    TOUCH_FILE(bld.EXPAND_VARIABLES('${PYTHONDIR}/samba/external/__init__.py'))