summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-10 04:25:50 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-10 03:54:01 +0000
commitc15e919a09b5af5d27f172ba127b94d58f2ee234 (patch)
treee2ef37a512b30b4521ce817ba81b2aece714ae06
parent5de1274d87efc66eac0b99a563cfef77bc3d6f9d (diff)
downloadsamba-c15e919a09b5af5d27f172ba127b94d58f2ee234.tar.gz
samba-c15e919a09b5af5d27f172ba127b94d58f2ee234.tar.bz2
samba-c15e919a09b5af5d27f172ba127b94d58f2ee234.zip
wafsamba: Clarify needs_python argument name, use pyembed/pyext where
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
-rw-r--r--buildtools/wafsamba/samba_python.py6
-rw-r--r--buildtools/wafsamba/wafsamba.py18
-rw-r--r--source4/lib/ldb/wscript2
-rwxr-xr-xsource4/librpc/wscript_build2
-rw-r--r--source4/param/wscript_build4
-rw-r--r--source4/scripting/python/wscript_build18
-rw-r--r--source4/smbd/wscript_build6
-rw-r--r--source4/torture/wscript_build6
-rw-r--r--source4/utils/net/wscript_build2
-rw-r--r--source4/utils/wscript_build2
-rw-r--r--source4/web_server/wscript_build6
11 files changed, 36 insertions, 36 deletions
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index 46e6657ce3..ad09981462 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -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)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 262d3bdc98..9c2c7be3b3 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -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,
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index cf013ce1f2..fffd8ce85b 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -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}')
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index fc68326425..8d506034ad 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -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,
)
diff --git a/source4/param/wscript_build b/source4/param/wscript_build
index 749aab36e2..3cb5e1bfe9 100644
--- a/source4/param/wscript_build
+++ b/source4/param/wscript_build
@@ -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
)
diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build
index d28985609f..055edc8f6a 100644
--- a/source4/scripting/python/wscript_build
+++ b/source4/scripting/python/wscript_build
@@ -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',
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 89eba835d1..a57fe291d6 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -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}'
)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index ddbf70af43..194758e6a9 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -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')
diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index 99d8c5593d..ee40cb8582 100644
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -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
)
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index a0b3ac5f9a..4e1c4c548d 100644
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -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
)
diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index 7064831072..dc1c3870dc 100644
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -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
)