sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

wafsamba: Clarify needs_python argument name, use pyembed/pyext where

Browse Source 
applicable.

Allow using both pyembed and pyext, to prevent unresolved symbols.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 10 03:54:01 UTC 2010 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2010-10-10 04:25:50 +02:00
parent 5de1274d87
commit c15e919a09
11 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildtools/wafsamba/samba_python.py
View File

@ -27,7 +27,7 @@ def SAMBA_PYTHON(bld, name,
if realname is None:
# a SAMBA_PYTHON target without a realname is just a
# library with needs_python=True
# library with pyembed=True
bld.SAMBA_LIBRARY(name,
source=source,
deps=deps,
@ -36,7 +36,7 @@ def SAMBA_PYTHON(bld, name,
cflags=cflags,
local_include=local_include,
vars=vars,
needs_python=True,
pyembed=True,
enabled=enabled)
return
@ -52,7 +52,7 @@ def SAMBA_PYTHON(bld, name,
local_include=local_include,
vars=vars,
link_name=link_name,
needs_python=True,
pyembed=True,
target_type='PYTHON',
install_path='${PYTHONDIR}',
enabled=enabled)

18
buildtools/wafsamba/wafsamba.py
View File

@ -106,7 +106,7 @@ def SAMBA_LIBRARY(bld, libname, source,
vars=None,
install_path=None,
install=True,
needs_python=False,
pyembed=False,
target_type='LIBRARY',
bundled_extension=True,
link_name=None,
@ -148,7 +148,7 @@ def SAMBA_LIBRARY(bld, libname, source,
group = group,
autoproto = autoproto,
depends_on = depends_on,
needs_python = needs_python,
pyembed = pyembed,
hide_symbols = hide_symbols,
local_include = local_include)
@ -174,7 +174,7 @@ def SAMBA_LIBRARY(bld, libname, source,
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
features += ' pyext'
elif needs_python:
if pyembed:
features += ' pyembed'
if abi_file:
features += ' abi_check'
@ -236,7 +236,7 @@ def SAMBA_BINARY(bld, binname, source,
manpages=None,
local_include=True,
subsystem_name=None,
needs_python=False,
pyembed=False,
vars=None,
install=True,
install_path=None,
@ -251,7 +251,7 @@ def SAMBA_BINARY(bld, binname, source,
return
features = 'cc cprogram symlink_bin install_bin'
if needs_python:
if pyembed:
features += ' pyembed'
obj_target = binname + '.objlist'
@ -270,7 +270,7 @@ def SAMBA_BINARY(bld, binname, source,
group = group,
autoproto = autoproto,
subsystem_name = subsystem_name,
needs_python = needs_python,
pyembed = pyembed,
local_include = local_include,
use_hostcc = use_hostcc,
use_global_deps= use_global_deps)
@ -403,7 +403,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
use_global_deps=True,
vars=None,
hide_symbols=False,
needs_python=False):
pyembed=False):
'''define a Samba subsystem'''
if not enabled:
@ -426,8 +426,8 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
bld.SET_BUILD_GROUP(group)
features = 'cc'
if needs_python:
features += ' pyext'
if pyembed:
features += ' pyembed'
t = bld(
features = features,

2
source4/lib/ldb/wscript
View File

@ -108,7 +108,7 @@ def build(bld):
abi_file = 'ABI/ldb-%s.sigs' % VERSION
bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb',
source='pyldb_util.c', needs_python=True)
source='pyldb_util.c', pyembed=True)
if not bld.CONFIG_SET('USING_SYSTEM_LDB'):
modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}')

2
source4/librpc/wscript_build
View File

@ -174,7 +174,7 @@ bld.SAMBA_LIBRARY('dcerpc',
bld.SAMBA_SUBSYSTEM('pyrpc_util',
source='rpc/pyrpc_util.c',
public_deps='PYTALLOC pyparam_util pycredentials dcerpc',
needs_python=True,
pyembed=True,
)

4
source4/param/wscript_build
View File

@ -14,7 +14,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG',
bld.SAMBA_SUBSYSTEM('PROVISION',
source='provision.c pyparam.c',
deps='LIBPYTHON pyparam_util ldb PYTALLOC',
needs_python=True,
pyembed=True,
)
@ -57,6 +57,6 @@ bld.SAMBA_PYTHON('param',
bld.SAMBA_SUBSYSTEM('pyparam_util',
source='pyparam_util.c',
deps='LIBPYTHON LIBSAMBA-HOSTCONFIG',
needs_python=True
pyembed=True
)

18
source4/scripting/python/wscript_build
View File

@ -1,19 +1,19 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('LIBPYTHON',
source='modules.c',
public_deps='EXT_LIB_PYTHON',
init_function_sentinal='{NULL,NULL}',
needs_python=True,
deps='talloc',
source='modules.c',
public_deps='EXT_LIB_PYTHON',
init_function_sentinal='{NULL,NULL}',
pyembed=True,
deps='talloc',
)
bld.SAMBA_SUBSYSTEM('PYTALLOC',
source='../../../lib/talloc/pytalloc.c',
public_deps='EXT_LIB_PYTHON talloc',
needs_python=True,
)
source='../../../lib/talloc/pytalloc.c',
public_deps='EXT_LIB_PYTHON talloc',
pyembed=True,
)
bld.SAMBA_PYTHON('python_uuid',

6
source4/smbd/wscript_build
View File

@ -17,11 +17,11 @@ bld.SAMBA_SUBSYSTEM('PIDFILE',
bld.SAMBA_BINARY('samba',
source='server.c',
manpages='samba.8',
subsystem_name='service',
subsystem_name='service',
deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
popt gensec registry ntptr ntvfs share CLUSTER DCESRV''',
needs_python=True,
install_path='${SBINDIR}'
pyembed=True,
install_path='${SBINDIR}'
)

6
source4/torture/wscript_build
View File

@ -144,7 +144,7 @@ bld.SAMBA_SUBSYSTEM('torturemain',
source='smbtorture.c torture.c shell.c',
subsystem_name='smbtorture',
deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
needs_python=True
pyembed=True
)
bld.SAMBA_BINARY('smbtorture',
@ -152,7 +152,7 @@ bld.SAMBA_BINARY('smbtorture',
manpages='man/smbtorture.1',
public_headers='smbtorture.h',
deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
needs_python=True
pyembed=True
)
# this is used in the build farm to build a smbtorture.static binary for s3
@ -160,7 +160,7 @@ bld.SAMBA_BINARY('smbtorture.static',
source=[],
deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
enabled = bld.env.BUILD_FARM,
needs_python=True
pyembed=True
)
bld.env.NONSHARED_BINARIES.append('smbtorture.static')

2
source4/utils/net/wscript_build
View File

@ -13,6 +13,6 @@ bld.SAMBA_BINARY('net',
source='net.c net_password.c net_vampire.c net_gpo.c',
autoproto='net_proto.h',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth',
needs_python=True
pyembed=True
)

2
source4/utils/wscript_build
View File

@ -4,7 +4,7 @@ bld.SAMBA_BINARY('ntlm_auth',
source='ntlm_auth.c',
manpages='man/ntlm_auth.1',
deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS service',
needs_python=True
pyembed=True
)

6
source4/web_server/wscript_build
View File

@ -2,9 +2,9 @@
bld.SAMBA_SUBSYSTEM('WEB_WSGI',
source='wsgi.c',
deps='talloc LIBTSOCKET',
needs_python=True
source='wsgi.c',
deps='talloc LIBTSOCKET',
pyembed=True
)