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':
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,
- pyembed = pyembed,
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 = 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,
group = group,
autoproto = autoproto,
subsystem_name = subsystem_name,
- pyembed = pyembed,
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"):]
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
use_global_deps=True,
vars=None,
hide_symbols=False,
- pyembed=False):
+ pyext=False):
'''define a Samba subsystem'''
if not enabled:
bld.SET_BUILD_GROUP(group)
features = 'cc'
- if pyembed:
- features += ' pyembed'
+ if pyext:
+ features += ' pyext'
t = bld(
features = features,