diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-04 11:00:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:25 +1000 |
| commit | 1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7 (patch) | |
| tree | aadeca78d8c2cb90afb691293fa5a1d6d7d15c0f /lib | |
| parent | 3ed6d7e76f9e2936e2d27ceeee8984950ea900a3 (diff) | |
| download | samba-1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7.tar.gz samba-1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7.tar.bz2 samba-1883ee6dbc2482a34ce531cec3c1c7e5e85af1e7.zip | |
s4-waf: avoid having to run waf configure before waf dist
This should be useful for building tarballs from a clean checkout
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/wscript | 18 | ||||
| -rw-r--r-- | lib/talloc/wscript | 5 | ||||
| -rw-r--r-- | lib/tdb/wscript | 5 | ||||
| -rw-r--r-- | lib/tevent/wscript | 5 |
4 files changed, 25 insertions, 8 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index cc718939e1..db6bc5c450 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -1,13 +1,25 @@ #!/usr/bin/env python -srcdir = '../..' +APPNAME = 'libreplace' +VERSION = '1.2.1' + 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 +import wafsamba, samba_dist import Options, os, preproc +samba_dist.DIST_DIRS('lib/replace buildtools:buildtools') + def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.BUNDLED_EXTENSION_DEFAULT('') diff --git a/lib/talloc/wscript b/lib/talloc/wscript index a7476b7ec4..17b3b1d349 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -20,13 +20,16 @@ import sys sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba, samba_dist +# setup what directories to put in a tarball +samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools') + + def set_options(opt): opt.BUILTIN_DEFAULT('replace') opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc') opt.recurse(LIBREPLACE_DIR) def configure(conf): - conf.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools') conf.sub_config(LIBREPLACE_DIR) if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, diff --git a/lib/tdb/wscript b/lib/tdb/wscript index c4b59e3a8f..3004c2dd92 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -15,7 +15,9 @@ for d in buildtools.split(): break sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba +import wafsamba, samba_dist + +samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools') LIBREPLACE_DIR= srcdir + '/lib/replace' @@ -26,7 +28,6 @@ def set_options(opt): opt.recurse(LIBREPLACE_DIR) def configure(conf): - conf.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools') conf.sub_config(LIBREPLACE_DIR) if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, diff --git a/lib/tevent/wscript b/lib/tevent/wscript index 41ca66ad15..976048d016 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -15,7 +15,9 @@ for d in buildtools.split(): break sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba +import wafsamba, samba_dist + +samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools') LIBREPLACE_DIR= srcdir + '/lib/replace' LIBTALLOC_DIR= srcdir + '/lib/talloc' @@ -27,7 +29,6 @@ def set_options(opt): opt.recurse(LIBTALLOC_DIR) def configure(conf): - conf.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools') conf.sub_config(LIBREPLACE_DIR) conf.sub_config(LIBTALLOC_DIR) |