summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-27 15:12:56 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:10 +1000
commitbd7bf0e1a91b6e6c78a52a458d3959ef84f4d3e3 (patch)
treea011a71b11906a72ba25360544814a9ce8f59a58 /source4
parent85a11c4fb7ee39294298657f0e88c23e9a37da98 (diff)
downloadsamba-bd7bf0e1a91b6e6c78a52a458d3959ef84f4d3e3.tar.gz
samba-bd7bf0e1a91b6e6c78a52a458d3959ef84f4d3e3.tar.bz2
samba-bd7bf0e1a91b6e6c78a52a458d3959ef84f4d3e3.zip
s4-waf: install the rest of our python files
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/wscript_build2
-rw-r--r--source4/scripting/python/samba_external/wscript_build9
-rw-r--r--source4/scripting/python/wscript_build4
-rw-r--r--source4/setup/wscript_build8
4 files changed, 15 insertions, 8 deletions
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index e4310e828f..ad0ac19873 100644
--- 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
index 0000000000..fcb2135e27
--- /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 cfa028f4a4..6d2fe9204c 100644
--- 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 1ad5edc6d9..06ce1cccd4 100644
--- 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