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

lib/talloc/wscript: update to handle waf 2.0.4

Browse Source 
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Alexander Bokovoy 2018-02-02 16:34:31 +02:00 committed by Andrew Bartlett
parent ea578830ce
commit 62bb5734b5
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/talloc/wscript
View File

@ -3,28 +3,27 @@
APPNAME = 'talloc' APPNAME = 'talloc'
VERSION = '2.1.14' VERSION = '2.1.14'
import os
blddir = 'bin' import sys
import Logs
import os, sys
# find the buildtools directory # find the buildtools directory
srcdir = '.' top = '.'
while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: while not os.path.exists(top+'/buildtools') and len(top.split('/')) < 5:
srcdir = srcdir + '/..' top = top + '/..'
sys.path.insert(0, srcdir + '/buildtools/wafsamba') sys.path.insert(0, top + '/buildtools/wafsamba')
import sys out = 'bin'
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, samba_dist, Options import wafsamba
from wafsamba import samba_dist, samba_utils
from waflib import Logs, Options, Context
# setup what directories to put in a tarball # setup what directories to put in a tarball
samba_dist.DIST_DIRS("""lib/talloc:. lib/replace:lib/replace samba_dist.DIST_DIRS("""lib/talloc:. lib/replace:lib/replace
buildtools:buildtools third_party/waf:third_party/waf""") buildtools:buildtools third_party/waf:third_party/waf""")
def set_options(opt): def options(opt):
opt.BUILTIN_DEFAULT('replace') opt.BUILTIN_DEFAULT('replace')
opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc') opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
opt.RECURSE('lib/replace') opt.RECURSE('lib/replace')
@ -173,19 +172,19 @@ def build(bld):
def test(ctx): def test(ctx):
'''run talloc testsuite''' '''run talloc testsuite'''
import Utils, samba_utils import samba_utils
samba_utils.ADD_LD_LIBRARY_PATH('bin/shared') samba_utils.ADD_LD_LIBRARY_PATH('bin/shared')
samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private') samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private')
cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite') cmd = os.path.join(Context.g_module.out, 'talloc_testsuite')
ret = samba_utils.RUN_COMMAND(cmd) ret = samba_utils.RUN_COMMAND(cmd)
print("testsuite returned %d" % ret) print("testsuite returned %d" % ret)
magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper') magic_helper_cmd = os.path.join(Context.g_module.out, 'talloc_test_magic_differs_helper')
magic_cmd = os.path.join(srcdir, 'lib', 'talloc', magic_cmd = os.path.join(Context.g_module.top, 'lib', 'talloc',
'test_magic_differs.sh') 'test_magic_differs.sh')
if not os.path.exists(magic_cmd): if not os.path.exists(magic_cmd):
magic_cmd = os.path.join(srcdir, 'test_magic_differs.sh') magic_cmd = os.path.join(Context.g_module.top, 'test_magic_differs.sh')
magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd) magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd)
print("magic differs test returned %d" % magic_ret) print("magic differs test returned %d" % magic_ret)
@ -199,7 +198,6 @@ def dist():
def reconfigure(ctx): def reconfigure(ctx):
'''reconfigure if config scripts have changed''' '''reconfigure if config scripts have changed'''
import samba_utils
samba_utils.reconfigure(ctx) samba_utils.reconfigure(ctx)