diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 10:18:39 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:25 +1000 |
| commit | 9e9e878e8f5f0fba51e3a576f17cf07d0857cff6 (patch) | |
| tree | 686d5931eb03b3db009f05b1dd5aab1ac367f3fd | |
| parent | 528d7c7cf39fe9d8867d751f0a3c26f413301515 (diff) | |
| download | samba-9e9e878e8f5f0fba51e3a576f17cf07d0857cff6.tar.gz samba-9e9e878e8f5f0fba51e3a576f17cf07d0857cff6.tar.bz2 samba-9e9e878e8f5f0fba51e3a576f17cf07d0857cff6.zip | |
s4-waf: allow standalone tarball build of libraries
| -rw-r--r-- | lib/talloc/wscript | 10 | ||||
| -rw-r--r-- | lib/tdb/wscript | 11 | ||||
| -rw-r--r-- | lib/tevent/wscript | 11 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 10 |
4 files changed, 35 insertions, 7 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript index f264513916..a7476b7ec4 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -3,9 +3,17 @@ APPNAME = 'talloc' VERSION = '2.0.2' -srcdir = '../..' blddir = 'bin' +# find the buildtools directory +import os +buildtools = 'buildtools ../../buildtools' +for d in buildtools.split(): + if os.path.exists(d): + srcdir = os.path.dirname(d) or '.' + break + + LIBREPLACE_DIR= srcdir + '/lib/replace' import sys diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 87bdcdf79d..c4b59e3a8f 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -3,10 +3,17 @@ APPNAME = 'tdb' VERSION = '1.2.1' -srcdir = '../..' blddir = 'bin' -import sys +import sys, os + +# find the buildtools directory +buildtools = 'buildtools ../../buildtools' +for d in buildtools.split(): + if os.path.exists(d): + srcdir = os.path.dirname(d) or '.' + break + sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba diff --git a/lib/tevent/wscript b/lib/tevent/wscript index 1298eb4588..41ca66ad15 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -3,10 +3,17 @@ APPNAME = 'tevent' VERSION = '0.9.8' -srcdir = '../..' blddir = 'bin' -import sys +import sys, os + +# find the buildtools directory +buildtools = 'buildtools ../../buildtools' +for d in buildtools.split(): + if os.path.exists(d): + srcdir = os.path.dirname(d) or '.' + break + sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 311672fe28..ddd5e138c4 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -3,10 +3,16 @@ APPNAME = 'ldb' VERSION = '0.9.10' -srcdir = '../../..' blddir = 'bin' -import sys +import sys, os +# find the buildtools directory +buildtools = 'buildtools ../../buildtools' +for d in buildtools.split(): + if os.path.exists(d): + srcdir = os.path.dirname(d) or '.' + break + sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba |