sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

waf: Fix mispelling

Browse Source 
Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Thu Apr 19 17:36:41 CEST 2012 on sn-devel-104
This commit is contained in:
Simo Sorce 2012-04-09 08:33:37 -04:00
parent 70d44a9a17
commit e21029a270
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildtools/wafsamba/samba_deps.py
View File

@ -214,7 +214,7 @@ def add_init_functions(self):
if m is not None: if m is not None:
modules.append(m) modules.append(m)
sentinal = getattr(self, 'init_function_sentinal', 'NULL') sentinel = getattr(self, 'init_function_sentinel', 'NULL')
targets = LOCAL_CACHE(bld, 'TARGET_TYPE') targets = LOCAL_CACHE(bld, 'TARGET_TYPE')
cflags = getattr(self, 'samba_cflags', [])[:] cflags = getattr(self, 'samba_cflags', [])[:]
@ -222,8 +222,8 @@ def add_init_functions(self):
if modules == []: if modules == []:
sname = sname.replace('-','_') sname = sname.replace('-','_')
sname = sname.replace('/','_') sname = sname.replace('/','_')
cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinal)) cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinel))
if sentinal == 'NULL': if sentinel == 'NULL':
cflags.append('-DSTATIC_%s_MODULES_PROTO' % sname) cflags.append('-DSTATIC_%s_MODULES_PROTO' % sname)
self.ccflags = cflags self.ccflags = cflags
return return
@ -236,11 +236,11 @@ def add_init_functions(self):
if targets[d['TARGET']] != 'DISABLED': if targets[d['TARGET']] != 'DISABLED':
init_fn_list.append(d['INIT_FUNCTION']) init_fn_list.append(d['INIT_FUNCTION'])
if init_fn_list == []: if init_fn_list == []:
cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinal)) cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinel))
if sentinal == 'NULL': if sentinel == 'NULL':
cflags.append('-DSTATIC_%s_MODULES_PROTO' % m) cflags.append('-DSTATIC_%s_MODULES_PROTO' % m)
else: else:
cflags.append('-DSTATIC_%s_MODULES=%s' % (m, ','.join(init_fn_list) + ',' + sentinal)) cflags.append('-DSTATIC_%s_MODULES=%s' % (m, ','.join(init_fn_list) + ',' + sentinel))
proto='' proto=''
for f in init_fn_list: for f in init_fn_list:
proto = proto + '_MODULE_PROTO(%s)' % f proto = proto + '_MODULE_PROTO(%s)' % f

6
buildtools/wafsamba/samba_python.py
View File

@ -21,7 +21,7 @@ def SAMBA_PYTHON(bld, name,
realname=None, realname=None,
cflags='', cflags='',
includes='', includes='',
init_function_sentinal=None, init_function_sentinel=None,
local_include=True, local_include=True,
vars=None, vars=None,
enabled=True): enabled=True):
@ -29,8 +29,8 @@ def SAMBA_PYTHON(bld, name,
# when we support static python modules we'll need to gather # when we support static python modules we'll need to gather
# the list from all the SAMBA_PYTHON() targets # the list from all the SAMBA_PYTHON() targets
if init_function_sentinal is not None: if init_function_sentinel is not None:
cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinal cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinel
source = bld.EXPAND_VARIABLES(source, vars=vars) source = bld.EXPAND_VARIABLES(source, vars=vars)

2
buildtools/wafsamba/wafsamba.py
View File

@ -477,7 +477,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
cflags='', cflags='',
cflags_end=None, cflags_end=None,
group='main', group='main',
init_function_sentinal=None, init_function_sentinel=None,
autoproto=None, autoproto=None,
autoproto_extra_source='', autoproto_extra_source='',
depends_on='', depends_on='',

2
source4/scripting/python/wscript_build
View File

@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('samba_python',
bld.SAMBA_SUBSYSTEM('LIBPYTHON', bld.SAMBA_SUBSYSTEM('LIBPYTHON',
source='modules.c', source='modules.c',
public_deps='', public_deps='',
init_function_sentinal='{NULL,NULL}', init_function_sentinel='{NULL,NULL}',
deps='talloc', deps='talloc',
pyext=True, pyext=True,
) )