s4-waf: install the rest of our python files

diff --git a/lib/subunit/python/wscript_build b/lib/subunit/python/wscript_build
index f690ae30d5b4521ddfec96c4448a318558d02e1b..a4d1bec301aa09e5e498b3d5965f365a3dddcc79 100644 (file)
--- a/lib/subunit/python/wscript_build
+++ b/lib/subunit/python/wscript_build
@@ -14,3 +14,8 @@ bld.SAMBA_SCRIPT('python_subunit',
 bld.SAMBA_SCRIPT('python_testtools',
                  pattern='testtools/**/*.py',
                  installdir='python')
+
+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'subunit/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'testtools/**/*.py', flat=False)
+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'iso8601/**/*.py', flat=False)
+

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index e4310e828fa307c4dd5032e2d3c4eb1ea9e6512f..ad0ac19873204b9933587fa9544c73aac1bcddc3 100644 (file)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -744,3 +744,5 @@ bld.SAMBA_SCRIPT('python_dcerpc_init',
                  pattern='rpc/dcerpc.py',
                  installdir='python/samba/dcerpc',
                  installname='__init__.py')
+
+bld.INSTALL_FILES('${PYTHONDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')

diff --git a/source4/scripting/python/samba_external/wscript_build b/source4/scripting/python/samba_external/wscript_build
new file mode 100644 (file)
index 0000000..fcb2135
--- /dev/null
+++ b/source4/scripting/python/samba_external/wscript_build
@@ -0,0 +1,9 @@
+# work out what external modules need to be installed
+external_list = []
+try:
+    import dns.resolver
+except:
+    external_list.append("dnspython")
+
+for e in external_list:
+    bld.INSTALL_WILDCARD('${PYTHONDIR}/samba_external', e + '/**/*', flat=False, exclude='*.pyc')

diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index cfa028f4a478d8d4d3afbbadc63644cfe7ded641..6d2fe9204cc43ad26c16de4e8e840a67510c371e 100644 (file)
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -36,3 +36,7 @@ bld.SAMBA_SUBSYSTEM('EXT_LIB_PYTHON', '')
 bld.SAMBA_SCRIPT('samba_python',
                  pattern='samba/**/*.py',
                  installdir='python')
+
+bld.BUILD_SUBDIR('samba_external')
+
+bld.INSTALL_WILDCARD('${PYTHONDIR}', 'samba/**/*.py', flat=False)

diff --git a/source4/setup/wscript_build b/source4/setup/wscript_build
index 1ad5edc6d99868a051edd08f683ceb843949d7c9..06ce1cccd454ec3a3a71266c982c3e9735c9f9ef 100644 (file)
--- a/source4/setup/wscript_build
+++ b/source4/setup/wscript_build
@@ -10,11 +10,3 @@ for p in '''schema-map-* DB_CONFIG *.inf *.ldif *.reg *.zone *.conf *.php *.txt
             provision.smb.conf.standalone'''.split():
     bld.INSTALL_WILDCARD('${SETUPDIR}', p)
 
-# echo "Installing external python libraries"
-# mkdir -p $PYTHONDIR/samba_external || exit 1
-# for p in $($PYTHON scripting/python/samba_external/missing.py);
-# do
-#   echo "Installing missing python library $p"
-#   mkdir -p $PYTHONDIR/samba_external/$p
-#   cp -r scripting/python/samba_external/$p/* $PYTHONDIR/samba_external/$p/ || exit 1
-# done