sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

s4-waf: added 'waf dist' to our standalone libs as well

Browse Source
This commit is contained in:
Andrew Tridgell 2010-04-04 10:06:34 +10:00
parent c8062fb65e
commit 528d7c7cf3
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildtools/wafsamba/samba_dist.py
View File

@ -1,7 +1,7 @@
# customised version of 'waf dist' for Samba tools # customised version of 'waf dist' for Samba tools
# uses git ls-files to get file lists # uses git ls-files to get file lists
import Utils, os, sys, tarfile, stat import Utils, os, sys, tarfile, stat, Scripting
from samba_utils import * from samba_utils import *
def add_tarfile(tar, fname, abspath): def add_tarfile(tar, fname, abspath):
@ -16,10 +16,10 @@ def add_tarfile(tar, fname, abspath):
fh.close() fh.close()
def dist(appname='', version=''): def dist():
if not appname: appname = Utils.g_module.APPNAME appname = Utils.g_module.APPNAME
if not version: version = Utils.g_module.VERSION version = Utils.g_module.VERSION
env = LOAD_ENVIRONMENT() env = LOAD_ENVIRONMENT()
srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir)) srcdir = os.path.normpath(os.path.join(os.path.dirname(Utils.g_module.root_path), Utils.g_module.srcdir))
@ -65,3 +65,5 @@ def DIST_DIRS(conf, dirs):
'''set the directories to package, relative to top srcdir''' '''set the directories to package, relative to top srcdir'''
if not conf.env.DIST_DIRS: if not conf.env.DIST_DIRS:
conf.env.DIST_DIRS = dirs conf.env.DIST_DIRS = dirs
Scripting.dist = dist

1
buildtools/wafsamba/wafsamba.py
View File

@ -23,6 +23,7 @@ import samba_conftests
import tru64cc import tru64cc
import irixcc import irixcc
import generic_cc import generic_cc
import samba_dist
# some systems have broken threading in python # some systems have broken threading in python
if os.environ.get('WAF_NOTHREADS') == '1': if os.environ.get('WAF_NOTHREADS') == '1':

2
lib/talloc/wscript
View File

@ -18,7 +18,7 @@ def set_options(opt):
opt.recurse(LIBREPLACE_DIR) opt.recurse(LIBREPLACE_DIR)
def configure(conf): def configure(conf):
conf.DIST_DIRS('lib/talloc:. buildtools:buildtools') conf.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
conf.sub_config(LIBREPLACE_DIR) conf.sub_config(LIBREPLACE_DIR)
if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,

4
lib/tdb/wscript
View File

@ -1,6 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
VERSION='1.2.1' APPNAME = 'tdb'
VERSION = '1.2.1'
srcdir = '../..' srcdir = '../..'
blddir = 'bin' blddir = 'bin'
@ -18,6 +19,7 @@ def set_options(opt):
opt.recurse(LIBREPLACE_DIR) opt.recurse(LIBREPLACE_DIR)
def configure(conf): def configure(conf):
conf.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
conf.sub_config(LIBREPLACE_DIR) conf.sub_config(LIBREPLACE_DIR)
if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,

2
lib/tevent/wscript
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
APPNAME = 'tevent'
VERSION = '0.9.8' VERSION = '0.9.8'
srcdir = '../..' srcdir = '../..'
@ -19,6 +20,7 @@ def set_options(opt):
opt.recurse(LIBTALLOC_DIR) opt.recurse(LIBTALLOC_DIR)
def configure(conf): 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(LIBREPLACE_DIR)
conf.sub_config(LIBTALLOC_DIR) conf.sub_config(LIBTALLOC_DIR)

3
source4/lib/ldb/wscript
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
APPNAME = 'ldb'
VERSION = '0.9.10' VERSION = '0.9.10'
srcdir = '../../..' srcdir = '../../..'
@ -21,6 +22,8 @@ def set_options(opt):
opt.recurse(LIBTEVENT_DIR) opt.recurse(LIBTEVENT_DIR)
def configure(conf): def configure(conf):
conf.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
lib/tdb:lib/tdb lib/tevent:lib/tevent buildtools:buildtools''')
conf.sub_config(LIBTDB_DIR) conf.sub_config(LIBTDB_DIR)
conf.sub_config(LIBTEVENT_DIR) conf.sub_config(LIBTEVENT_DIR)
conf.sub_config(LIBPOPT_DIR) conf.sub_config(LIBPOPT_DIR)