# a waf tool to add autoconf-like macros to the configure section
# and for SAMBA_ macros for building libraries, binaries etc
-import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs
+import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs, Constants
from Configure import conf
from Logs import debug
from samba_utils import SUBST_VARS_RECURSIVE
+TaskGen.task_gen.apply_verif = Utils.nada
# bring in the other samba modules
from samba_optimisation import *
from samba_utils import *
+from samba_version import *
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 *
from samba_bundled import *
import samba_install
import samba_conftests
+import samba_abi
import tru64cc
import irixcc
import generic_cc
import samba_dist
-
-O644 = 420
+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 < 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
+for details.
+
+Alternatively, please use ./autogen-waf.sh, and then
+run ./configure and make as usual. That will call the right version of waf.
+''')
+ sys.exit(1)
+
+
@conf
def SAMBA_BUILD_ENV(conf):
'''create the samba build environment'''
conf.env.BUILD_DIRECTORY = conf.blddir
mkdir_p(os.path.join(conf.blddir, LIB_PATH))
+ mkdir_p(os.path.join(conf.blddir, "modules"))
mkdir_p(os.path.join(conf.blddir, 'python/samba/dcerpc'))
# this allows all of the bin/shared and bin/python targets
# to be expressed in terms of build directory paths
- for p in ['python','shared']:
+ mkdir_p(os.path.join(conf.blddir, 'default'))
+ for p in ['python','shared', 'modules']:
link_target = os.path.join(conf.blddir, 'default/' + p)
if not os.path.lexists(link_target):
os.symlink('../' + p, link_target)
vars=None,
install_path=None,
install=True,
- needs_python=False,
+ pyembed=False,
+ pyext=False,
target_type='LIBRARY',
bundled_extension=True,
link_name=None,
+ abi_file=None,
+ abi_match=None,
+ hide_symbols=False,
+ manpages=None,
+ private_library=False,
+ grouping_library=False,
enabled=True):
'''define a Samba library'''
source = bld.EXPAND_VARIABLES(source, vars=vars)
# remember empty libraries, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, libname, 'EMPTY')
return
- if target_type != 'PYTHON' and BUILTIN_LIBRARY(bld, libname):
+ if BUILTIN_LIBRARY(bld, libname):
obj_target = libname
else:
obj_target = libname + '.objlist'
group = group,
autoproto = autoproto,
depends_on = depends_on,
- needs_python = needs_python,
+ hide_symbols = hide_symbols,
+ pyext = pyext or (target_type == "PYTHON"),
local_include = local_include)
- if libname == obj_target:
+ if BUILTIN_LIBRARY(bld, libname):
return
if not SET_TARGET_TYPE(bld, libname, target_type):
deps = TO_LIST(deps)
deps.append(obj_target)
- if target_type == 'PYTHON':
- bundled_name = libname
+ realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
+ link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
+
+ # 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 private_library:
+ # 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 = PRIVATE_NAME(bld, libname, bundled_extension, private_library)
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
features += ' pyext'
- elif needs_python:
+ if pyext or pyembed:
+ # this is quite strange. we should add pyext feature for pyext
+ # but that breaks the build. This may be a bug in the waf python tool
features += ' pyembed'
+ if abi_file:
+ features += ' abi_check'
+
+ if abi_file:
+ abi_file = os.path.join(bld.curdir, abi_file)
bld.SET_BUILD_GROUP(group)
t = bld(
features = features,
source = [],
target = bundled_name,
- samba_cflags = CURRENT_CFLAGS(bld, libname, cflags),
depends_on = depends_on,
samba_deps = deps,
samba_includes = includes,
vnum = vnum,
install_path = None,
samba_inst_path = install_path,
- name = libname,
+ name = libname,
samba_realname = realname,
- samba_install = install
+ samba_install = install,
+ abi_file = abi_file,
+ abi_match = abi_match,
+ private_library = private_library,
+ grouping_library=grouping_library
)
+ if realname and not link_name:
+ link_name = 'shared/%s' % realname
+
if link_name:
t.link_name = link_name
- if autoproto is not None:
- bld.SAMBA_AUTOPROTO(autoproto, source)
-
- if public_headers is not None:
- bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
-
if pc_files is not None:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
+ if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ bld.MANPAGES(manpages)
+
+
Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
public_headers=None,
header_path=None,
modules=None,
- installdir=None,
ldflags=None,
cflags='',
autoproto=None,
use_hostcc=False,
+ use_global_deps=True,
compiler=None,
group='binaries',
manpages=None,
local_include=True,
subsystem_name=None,
- needs_python=False,
+ pyembed=False,
vars=None,
install=True,
- install_path=None):
+ install_path=None,
+ enabled=True):
'''define a Samba binary'''
+ if not enabled:
+ SET_TARGET_TYPE(bld, binname, 'DISABLED')
+ return
+
if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
return
features = 'cc cprogram symlink_bin install_bin'
- if needs_python:
+ if pyembed:
features += ' pyembed'
obj_target = binname + '.objlist'
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ source = unique_list(TO_LIST(source))
# first create a target for building the object files for this binary
# by separating in this way, we avoid recompiling the C files
group = group,
autoproto = autoproto,
subsystem_name = subsystem_name,
- needs_python = needs_python,
local_include = local_include,
- use_hostcc = use_hostcc)
+ 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_deps = deps,
samba_includes = includes,
local_include = local_include,
if subsystem_name is not None:
bld.TARGET_ALIAS(subsystem_name, binname)
- if autoproto is not None:
- bld.SAMBA_AUTOPROTO(autoproto, source)
- if public_headers is not None:
- bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
+ if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ bld.MANPAGES(manpages)
+
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
internal_module=True,
local_include=True,
vars=None,
- enabled=True):
+ enabled=True,
+ pyembed=True,
+ ):
'''define a Samba module.'''
- # we add the init function regardless of whether the module
- # is enabled or not, as we need to generate a null list if
- # all disabled
- bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
+ source = bld.EXPAND_VARIABLES(source, vars=vars)
if internal_module or BUILTIN_LIBRARY(bld, modname):
# treat internal modules as subsystems for now
- SAMBA_SUBSYSTEM(bld, modname, source,
- deps=deps,
- includes=includes,
- autoproto=autoproto,
- autoproto_extra_source=autoproto_extra_source,
- cflags=cflags,
- local_include=local_include,
- enabled=enabled)
+ if subsystem is not None:
+ deps += ' ' + subsystem
+
+ bld.SAMBA_SUBSYSTEM(modname, source,
+ deps=deps,
+ includes=includes,
+ autoproto=autoproto,
+ autoproto_extra_source=autoproto_extra_source,
+ cflags=cflags,
+ local_include=local_include,
+ enabled=enabled)
+
+ bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
return
if not enabled:
SET_TARGET_TYPE(bld, modname, 'DISABLED')
return
- source = bld.EXPAND_VARIABLES(source, vars=vars)
-
- # remember empty modules, so we can strip the dependencies
- if (source == '') or (source == []):
- SET_TARGET_TYPE(bld, modname, 'EMPTY')
+ if aliases is not None:
+ # if we have aliases, then create a private base library, and a set
+ # of modules on top of that library
+ if init_function:
+ cflags += " -D%s=samba_init_module" % init_function
+
+ basename = modname + '-base'
+ bld.SAMBA_LIBRARY(basename,
+ source,
+ deps=deps,
+ cflags=cflags,
+ autoproto = autoproto,
+ local_include=local_include,
+ vars=vars,
+ pyembed=pyembed,
+ private_library=True
+ )
+
+ aliases = TO_LIST(aliases)
+ aliases.append(modname)
+
+ for alias in aliases:
+ bld.SAMBA_MODULE(alias,
+ source=[],
+ internal_module=False,
+ subsystem=subsystem,
+ init_function=init_function,
+ deps=basename)
return
- if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
- return
+ obj_target = modname + '.objlist'
+
+ realname = modname
if subsystem is not None:
deps += ' ' + subsystem
+ while realname.startswith("lib"+subsystem+"_"):
+ realname = realname[len("lib"+subsystem+"_"):]
+ while realname.startswith(subsystem+"_"):
+ realname = realname[len(subsystem+"_"):]
+
+ 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,
+ cflags=cflags,
+ realname = realname,
+ autoproto = autoproto,
+ local_include=local_include,
+ vars=vars,
+ link_name=build_link_name,
+ install_path="${MODULESDIR}/%s" % subsystem,
+ pyembed=pyembed,
+ )
- bld.SET_BUILD_GROUP('main')
- bld(
- features = 'cc',
- source = source,
- target = modname,
- samba_cflags = CURRENT_CFLAGS(bld, modname, cflags),
- samba_includes = includes,
- local_include = local_include,
- samba_deps = TO_LIST(deps)
- )
-
- if autoproto is not None:
- bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
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='',
subsystem_name=None,
enabled=True,
use_hostcc=False,
+ use_global_deps=True,
vars=None,
- needs_python=False):
+ hide_symbols=False,
+ pyext=False):
'''define a Samba subsystem'''
if not enabled:
return
# remember empty subsystems, so we can strip the dependencies
- if (source == '') or (source == []):
+ if ((source == '') or (source == [])) and deps == '' and public_deps == '':
SET_TARGET_TYPE(bld, modname, 'EMPTY')
return
return
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ source = unique_list(TO_LIST(source))
deps += ' ' + public_deps
bld.SET_BUILD_GROUP(group)
features = 'cc'
- if needs_python:
+ if pyext:
features += ' pyext'
t = bld(
features = features,
source = source,
target = modname,
- samba_cflags = CURRENT_CFLAGS(bld, modname, cflags),
+ samba_cflags = CURRENT_CFLAGS(bld, modname, cflags, hide_symbols=hide_symbols),
depends_on = depends_on,
samba_deps = TO_LIST(deps),
samba_includes = includes,
local_include = local_include,
local_include_first = local_include_first,
samba_subsystem= subsystem_name,
- samba_use_hostcc = use_hostcc
+ samba_use_hostcc = use_hostcc,
+ samba_use_global_deps = use_global_deps
)
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 + ' ' + autoproto_extra_source)
+ bld.SAMBA_AUTOPROTO(autoproto, source + TO_LIST(autoproto_extra_source))
if public_headers is not None:
bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
return t
group='generators', enabled=True,
public_headers=None,
header_path=None,
- vars=None):
+ vars=None,
+ always=False):
'''A generic source generator target'''
if not SET_TARGET_TYPE(bld, name, 'GENERATOR'):
ext_out='.c',
name=name)
+ if always:
+ t.always = True
+
if public_headers is not None:
bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
return t
Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
-def install_file(bld, destdir, file, chmod=O644, 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)
if python_fixup:
# fixup the python path it will use to find Samba modules
inst_file = file + '.inst'
+ if bld.env["PYTHONDIR"] not in sys.path:
+ regex = "s|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONDIR}\\2|g"
+ else:
+ # Eliminate updating sys.path if the target python dir is already
+ # in python path.
+ regex = "s|sys.path.insert.*bin/python.*$||g"
bld.SAMBA_GENERATOR('python_%s' % destname,
- rule="sed 's|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONDIR}\\2|g' < ${SRC} > ${TGT}",
+ rule="sed '%s' < ${SRC} > ${TGT}" % regex,
source=file,
target=inst_file)
file = inst_file
bld.install_as(dest, file, chmod=chmod)
-def INSTALL_FILES(bld, destdir, files, chmod=O644, 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=O644, 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))
Build.BuildContext.INSTALL_WILDCARD = INSTALL_WILDCARD
+def INSTALL_DIRS(bld, destdir, dirs):
+ '''install a set of directories'''
+ destdir = bld.EXPAND_VARIABLES(destdir)
+ dirs = bld.EXPAND_VARIABLES(dirs)
+ for d in TO_LIST(dirs):
+ bld.install_dir(os.path.join(destdir, d))
+Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS
+
+
+re_header = re.compile('#include[ \t]*"([^"]+)"', re.I | re.M)
+class header_task(Task.Task):
+ """
+ The public headers (the one installed on the system) have both
+ different paths and contents, so the rename is not enough.
+
+ Intermediate .inst.h files are created because path manipulation
+ may be slow. The substitution is thus performed only once.
+ """
+
+ name = 'header'
+ color = 'PINK'
+ vars = ['INCLUDEDIR', 'HEADER_DEPS']
+
+ def run(self):
+ txt = self.inputs[0].read(self.env)
+
+ # hard-coded string, but only present in samba4 (I promise, you won't feel a thing)
+ txt = txt.replace('#if _SAMBA_BUILD_ == 4', '#if 1\n')
+
+ # use a regexp to substitute the #include lines in the files
+ map = self.generator.bld.hnodemap
+ dirnodes = self.generator.bld.hnodedirs
+ def repl(m):
+ if m.group(1):
+ s = m.group(1)
+
+ # pokemon headers: gotta catch'em all!
+ fin = s
+ if s.startswith('bin/default'):
+ node = self.generator.bld.srcnode.find_resource(s.replace('bin/default/', ''))
+ if not node:
+ Logs.warn('could not find the public header for %r' % s)
+ elif node.id in map:
+ fin = map[node.id]
+ else:
+ Logs.warn('could not find the public header replacement for build header %r' % s)
+ else:
+ # this part is more difficult since the path may be relative to anything
+ for dirnode in dirnodes:
+ node = dirnode.find_resource(s)
+ if node:
+ if node.id in map:
+ fin = map[node.id]
+ break
+ else:
+ Logs.warn('could not find the public header replacement for source header %r %r' % (s, node))
+ else:
+ Logs.warn('-> could not find the public header for %r' % s)
+
+ return "#include <%s>" % fin
+ return ''
+
+ txt = re_header.sub(repl, txt)
+
+ # and write the output file
+ f = None
+ try:
+ f = open(self.outputs[0].abspath(self.env), 'w')
+ f.write(txt)
+ finally:
+ if f:
+ f.close()
+
+@TaskGen.feature('pubh')
+def make_public_headers(self):
+ """
+ collect the public headers to process and to install, then
+ create the substitutions (name and contents)
+ """
+
+ if not self.bld.is_install:
+ # install time only (lazy)
+ return
+
+ # keep two variables
+ # hnodedirs: list of folders for searching the headers
+ # hnodemap: node ids and replacement string (node objects are unique)
+ try:
+ self.bld.hnodedirs.append(self.path)
+ except AttributeError:
+ self.bld.hnodemap = {}
+ self.bld.hnodedirs = [self.bld.srcnode, self.path]
+
+ for k in 'source4 source4/include lib/talloc lib/tevent/ source4/lib/ldb/include/'.split():
+ node = self.bld.srcnode.find_dir(k)
+ if node:
+ self.bld.hnodedirs.append(node)
+
+ header_path = getattr(self, 'header_path', None) or ''
+
+ for x in self.to_list(self.headers):
+
+ # too complicated, but what was the original idea?
+ if isinstance(header_path, list):
+ add_dir = ''
+ for (p1, dir) in header_path:
+ lst = self.to_list(p1)
+ for p2 in lst:
+ if fnmatch.fnmatch(x, p2):
+ add_dir = dir
+ break
+ else:
+ continue
+ break
+ inst_path = add_dir
+ else:
+ inst_path = header_path
+
+ dest = ''
+ name = x
+ if x.find(':') != -1:
+ s = x.split(':')
+ name = s[0]
+ dest = s[1]
+
+ inn = self.path.find_resource(name)
+
+ if not inn:
+ raise ValueError("could not find the public header %r in %r" % (name, self.path))
+ out = inn.change_ext('.inst.h')
+ self.create_task('header', inn, out)
+
+ if not dest:
+ dest = inn.name
+
+ if inst_path:
+ inst_path = inst_path + '/'
+ inst_path = inst_path + dest
+
+ self.bld.install_as('${INCLUDEDIR}/%s' % inst_path, out, self.env)
+
+ self.bld.hnodemap[inn.id] = inst_path
+
+ # create a hash (not md5) to make sure the headers are re-created if something changes
+ val = 0
+ lst = list(self.bld.hnodemap.keys())
+ lst.sort()
+ for k in lst:
+ val = hash((val, k, self.bld.hnodemap[k]))
+ self.bld.env.HEADER_DEPS = val
+
def PUBLIC_HEADERS(bld, public_headers, header_path=None):
'''install some headers
or it can be a dictionary of wildcard patterns which map to destination
directories relative to INCLUDEDIR
'''
- dest = '${INCLUDEDIR}'
- if isinstance(header_path, str):
- dest += '/' + header_path
- for h in TO_LIST(public_headers):
- hdest = dest
- if isinstance(header_path, list):
- for (p1, dir) in header_path:
- found_match=False
- lst = TO_LIST(p1)
- for p2 in lst:
- if fnmatch.fnmatch(h, p2):
- if dir:
- hdest = os.path.join(hdest, dir)
- found_match=True
- break
- if found_match: break
- if h.find(':') != -1:
- hs=h.split(':')
- INSTALL_FILES(bld, hdest, hs[0], flat=True, destname=hs[1])
- else:
- INSTALL_FILES(bld, hdest, h, flat=True)
+ bld.SET_BUILD_GROUP('final')
+ ret = bld(features=['pubh'], headers=public_headers, header_path=header_path)
+ return ret
Build.BuildContext.PUBLIC_HEADERS = PUBLIC_HEADERS
# split on the vars
a = re.split('(@\w+@)', s)
out = []
+ done_var = {}
back_sub = [ ('PREFIX', '${prefix}'), ('EXEC_PREFIX', '${exec_prefix}')]
for v in a:
if re.match('@\w+@', v):
for (b, m) in back_sub:
s = task.env[b]
if s == v[0:len(s)]:
- v = m + v[len(s):]
+ if not b in done_var:
+ # we don't want to substitute the first usage
+ done_var[b] = True
+ else:
+ v = m + v[len(s):]
+ break
out.append(v)
contents = ''.join(out)
f = open(tgt, 'w')
Build.BuildContext.PKG_CONFIG_FILES = PKG_CONFIG_FILES
+def MANPAGES(bld, manpages):
+ '''build and install manual pages'''
+ bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
+ for m in manpages.split():
+ source = m + '.xml'
+ bld.SAMBA_GENERATOR(m,
+ source=source,
+ target=m,
+ group='final',
+ rule='${XSLTPROC} -o ${TGT} --nonet ${MAN_XSL} ${SRC}'
+ )
+ bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
+Build.BuildContext.MANPAGES = MANPAGES
+
#############################################################
# give a nicer display when building different types of files