from samba_autoconf import *
from samba_patterns import *
from samba_pidl import *
-from samba_errtable import *
-from samba_asn1 import *
from samba_autoproto import *
from samba_python import *
from samba_deps import *
import generic_cc
import samba_dist
import samba_wildcard
+import stale_files
# some systems have broken threading in python
if os.environ.get('WAF_NOTHREADS') == '1':
os.putenv('PYTHONUNBUFFERED', '1')
-if Constants.HEXVERSION < 0x105016:
+if Constants.HEXVERSION < 0x105019:
Logs.error('''
Please use the version of waf that comes with Samba, not
a system installed version. See http://wiki.samba.org/index.php/Waf
vars=None,
install_path=None,
install=True,
- needs_python=False,
+ pyembed=False,
target_type='LIBRARY',
bundled_extension=True,
link_name=None,
hide_symbols=False,
is_bundled=False,
manpages=None,
+ private_library=False,
enabled=True):
'''define a Samba library'''
group = group,
autoproto = autoproto,
depends_on = depends_on,
- needs_python = needs_python,
hide_symbols = hide_symbols,
+ pyext = (target_type == "PYTHON"),
local_include = local_include)
if BUILTIN_LIBRARY(bld, libname):
deps = TO_LIST(deps)
deps.append(obj_target)
+ realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
+ link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
+
+ if private_library:
+ # private libraries always get the 'bundling' treatment with respect
+ # to the library name suffix
+ is_bundled = True
+
+ # we don't want any public libraries without version numbers
+ if not private_library and vnum is None and target_type != 'PYTHON' and not realname:
+ raise Utils.WafError("public library '%s' must have a vnum" % libname)
+
if target_type == 'PYTHON' or realname or not is_bundled:
# Sanitize the library name
bundled_name = libname.lower().replace('_', '-')
while bundled_name.startswith("lib"):
bundled_name = bundled_name[3:]
else:
- bundled_name = BUNDLED_NAME(bld, libname, bundled_extension)
+ bundled_name = BUNDLED_NAME(bld, libname, bundled_extension, private_library)
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'
features = features,
source = [],
target = bundled_name,
- samba_cflags = CURRENT_CFLAGS(bld, libname, cflags),
+ samba_cflags = CURRENT_LDFLAGS(bld, libname, cflags),
depends_on = depends_on,
samba_deps = deps,
samba_includes = includes,
manpages=None,
local_include=True,
subsystem_name=None,
- needs_python=False,
+ pyembed=False,
vars=None,
install=True,
install_path=None,
return
features = 'cc cprogram symlink_bin install_bin'
- if needs_python:
+ if pyembed:
features += ' pyembed'
obj_target = binname + '.objlist'
group = group,
autoproto = autoproto,
subsystem_name = subsystem_name,
- needs_python = needs_python,
local_include = local_include,
use_hostcc = use_hostcc,
+ pyext = pyembed,
use_global_deps= use_global_deps)
bld.SET_BUILD_GROUP(group)
features = features,
source = [],
target = binname,
- samba_cflags = CURRENT_CFLAGS(bld, binname, cflags),
+ samba_cflags = CURRENT_LDFLAGS(bld, binname, cflags),
samba_deps = deps,
samba_includes = includes,
local_include = local_include,
internal_module=True,
local_include=True,
vars=None,
- enabled=True):
+ enabled=True,
+ pyembed=True,
+ ):
'''define a Samba module.'''
source = bld.EXPAND_VARIABLES(source, vars=vars)
while realname.startswith(subsystem+"_"):
realname = realname[len(subsystem+"_"):]
- realname = bld.env.shlib_PATTERN % realname
+ realname = bld.make_libname(realname)
while realname.startswith("lib"):
realname = realname[len("lib"):]
build_link_name = "modules/%s/%s" % (subsystem, realname)
+ if init_function:
+ cflags += " -D%s=samba_init_module" % init_function
+
bld.SAMBA_LIBRARY(modname,
source,
deps=deps,
local_include=local_include,
vars=vars,
link_name=build_link_name,
- install_path="${MODULESDIR}/%s" % subsystem
+ install_path="${MODULESDIR}/%s" % subsystem,
+ pyembed=pyembed,
)
Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
cflags_end=None,
group='main',
init_function_sentinal=None,
- heimdal_autoproto=None,
- heimdal_autoproto_options=None,
- heimdal_autoproto_private=None,
autoproto=None,
autoproto_extra_source='',
depends_on='',
use_global_deps=True,
vars=None,
hide_symbols=False,
- needs_python=False):
+ pyext=False):
'''define a Samba subsystem'''
if not enabled:
bld.SET_BUILD_GROUP(group)
features = 'cc'
- if needs_python:
+ if pyext:
features += ' pyext'
t = bld(
if cflags_end is not None:
t.samba_cflags.extend(TO_LIST(cflags_end))
- if heimdal_autoproto is not None:
- bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source, options=heimdal_autoproto_options)
- if heimdal_autoproto_private is not None:
- bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
if autoproto is not None:
bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source))
if public_headers is not None:
Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
-def install_file(bld, destdir, file, chmod=0644, flat=False,
+def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
python_fixup=False, destname=None, base_name=None):
'''install a file'''
destdir = bld.EXPAND_VARIABLES(destdir)
bld.install_as(dest, file, chmod=chmod)
-def INSTALL_FILES(bld, destdir, files, chmod=0644, flat=False,
+def INSTALL_FILES(bld, destdir, files, chmod=MODE_644, flat=False,
python_fixup=False, destname=None, base_name=None):
'''install a set of files'''
for f in TO_LIST(files):
Build.BuildContext.INSTALL_FILES = INSTALL_FILES
-def INSTALL_WILDCARD(bld, destdir, pattern, chmod=0644, flat=False,
+def INSTALL_WILDCARD(bld, destdir, pattern, chmod=MODE_644, flat=False,
python_fixup=False, exclude=None, trim_path=None):
'''install a set of files matching a wildcard pattern'''
files=TO_LIST(bld.path.ant_glob(pattern))