# 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, Constants
+import Build, os, sys, 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
import samba_install
import samba_conftests
import samba_abi
+import samba_headers
import tru64cc
import irixcc
+import hpuxcc
import generic_cc
import samba_dist
import samba_wildcard
+import stale_files
+import symbols
+import pkgconfig
# some systems have broken threading in python
if os.environ.get('WAF_NOTHREADS') == '1':
LIB_PATH="shared"
-os.putenv('PYTHONUNBUFFERED', '1')
+os.environ['PYTHONUNBUFFERED'] = '1'
if Constants.HEXVERSION < 0x105019:
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.
-''')
+Alternatively, please run ./configure and make as usual. That will
+call the right version of waf.''')
sys.exit(1)
'''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, LIB_PATH, "private"))
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
public_deps='',
includes='',
public_headers=None,
+ public_headers_install=True,
header_path=None,
pc_files=None,
vnum=None,
+ soname=None,
cflags='',
+ ldflags='',
external_library=False,
realname=None,
autoproto=None,
- group='main',
+ autoproto_extra_source='',
+ group='libraries',
depends_on='',
local_include=True,
+ global_include=True,
vars=None,
+ subdir=None,
install_path=None,
install=True,
pyembed=False,
+ pyext=False,
target_type='LIBRARY',
bundled_extension=True,
link_name=None,
- abi_file=None,
+ abi_directory=None,
abi_match=None,
hide_symbols=False,
- is_bundled=False,
manpages=None,
+ private_library=False,
+ grouping_library=False,
+ allow_undefined_symbols=False,
enabled=True):
'''define a Samba library'''
+ if LIB_MUST_BE_PRIVATE(bld, libname):
+ private_library=True
+
if not enabled:
SET_TARGET_TYPE(bld, libname, 'DISABLED')
return
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ if subdir:
+ source = bld.SUBDIR(subdir, source)
# remember empty libraries, so we can strip the dependencies
if ((source == '') or (source == [])) and deps == '' and public_deps == '':
else:
obj_target = libname + '.objlist'
+ if group == 'libraries':
+ subsystem_group = 'main'
+ else:
+ subsystem_group = group
+
# first create a target for building the object files for this library
# by separating in this way, we avoid recompiling the C files
# separately for the install library and the build library
public_deps = public_deps,
includes = includes,
public_headers = public_headers,
+ public_headers_install = public_headers_install,
header_path = header_path,
cflags = cflags,
- group = group,
+ group = subsystem_group,
autoproto = autoproto,
+ autoproto_extra_source=autoproto_extra_source,
depends_on = depends_on,
hide_symbols = hide_symbols,
- pyext = (target_type == "PYTHON"),
- local_include = local_include)
+ pyembed = pyembed,
+ pyext = pyext,
+ local_include = local_include,
+ global_include = global_include)
if BUILTIN_LIBRARY(bld, libname):
return
deps = TO_LIST(deps)
deps.append(obj_target)
- 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:]
+ 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 target_type != 'PYTHON' and not realname):
+ if vnum is None and soname is None:
+ raise Utils.WafError("public library '%s' must have a vnum" %
+ libname)
+ if pc_files is None:
+ raise Utils.WafError("public library '%s' must have pkg-config file" %
+ libname)
+ if public_headers is None:
+ raise Utils.WafError("public library '%s' must have header files" %
+ libname)
+
+ if target_type == 'PYTHON' or realname or not private_library:
+ bundled_name = libname.replace('_', '-')
else:
- bundled_name = BUNDLED_NAME(bld, libname, bundled_extension)
+ bundled_name = PRIVATE_NAME(bld, libname, bundled_extension,
+ private_library)
+
+ ldflags = TO_LIST(ldflags)
features = 'cc cshlib symlink_lib install_lib'
- if target_type == 'PYTHON':
+ if pyext:
features += ' pyext'
if pyembed:
features += ' pyembed'
- if abi_file:
+
+ if abi_directory:
features += ' abi_check'
- if abi_file:
- abi_file = os.path.join(bld.curdir, abi_file)
+ vscript = None
+ if bld.env.HAVE_LD_VERSION_SCRIPT:
+ if private_library:
+ version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
+ elif vnum:
+ version = "%s_%s" % (libname, vnum)
+ else:
+ version = None
+ if version:
+ vscript = "%s.vscript" % libname
+ bld.ABI_VSCRIPT(libname, abi_directory, version, vscript,
+ abi_match)
+ fullname = apply_pattern(bundled_name, bld.env.shlib_PATTERN)
+ fullpath = bld.path.find_or_declare(fullname)
+ vscriptpath = bld.path.find_or_declare(vscript)
+ if not fullpath:
+ raise Utils.WafError("unable to find fullpath for %s" % fullname)
+ if not vscriptpath:
+ raise Utils.WafError("unable to find vscript path for %s" % vscript)
+ bld.add_manual_dependency(fullpath, vscriptpath)
+ if Options.is_install:
+ # also make the .inst file depend on the vscript
+ instname = apply_pattern(bundled_name + '.inst', bld.env.shlib_PATTERN)
+ bld.add_manual_dependency(bld.path.find_or_declare(instname), bld.path.find_or_declare(vscript))
+ vscript = os.path.join(bld.path.abspath(bld.env), vscript)
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_ldflags = ldflags,
samba_deps = deps,
samba_includes = includes,
+ version_script = vscript,
local_include = local_include,
+ global_include = global_include,
vnum = vnum,
+ soname = soname,
install_path = None,
samba_inst_path = install_path,
name = libname,
samba_realname = realname,
samba_install = install,
- abi_file = abi_file,
+ abi_directory = "%s/%s" % (bld.path.abspath(), abi_directory),
abi_match = abi_match,
- is_bundled = is_bundled
+ private_library = private_library,
+ grouping_library=grouping_library,
+ allow_undefined_symbols=allow_undefined_symbols
)
if realname and not link_name:
if link_name:
t.link_name = link_name
- if pc_files is not None:
+ if pc_files is not None and not private_library:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
+ bld.env['XSLTPROC_MANPAGES']):
bld.MANPAGES(manpages)
group='binaries',
manpages=None,
local_include=True,
+ global_include=True,
subsystem_name=None,
pyembed=False,
vars=None,
+ subdir=None,
install=True,
install_path=None,
enabled=True):
obj_target = binname + '.objlist'
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ if subdir:
+ source = bld.SUBDIR(subdir, source)
source = unique_list(TO_LIST(source))
+ if group == 'binaries':
+ subsystem_group = 'main'
+ else:
+ subsystem_group = group
+
# first create a target for building the object files for this binary
# by separating in this way, we avoid recompiling the C files
# separately for the install binary and the build binary
deps = deps,
includes = includes,
cflags = cflags,
- group = group,
+ group = subsystem_group,
autoproto = autoproto,
subsystem_name = subsystem_name,
local_include = local_include,
+ global_include = global_include,
use_hostcc = use_hostcc,
pyext = pyembed,
use_global_deps= use_global_deps)
features = features,
source = [],
target = binname,
- samba_cflags = CURRENT_CFLAGS(bld, binname, cflags),
samba_deps = deps,
samba_includes = includes,
local_include = local_include,
+ global_include = global_include,
samba_modules = modules,
top = True,
samba_subsystem= subsystem_name,
install_path = None,
samba_inst_path= install_path,
- samba_install = install
+ samba_install = install,
+ samba_ldflags = TO_LIST(ldflags)
)
- # setup the subsystem_name as an alias for the real
- # binary name, so it can be found when expanding
- # subsystem dependencies
- if subsystem_name is not None:
- bld.TARGET_ALIAS(subsystem_name, binname)
-
if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
bld.MANPAGES(manpages)
includes='',
subsystem=None,
init_function=None,
+ module_init_name='samba_init_module',
autoproto=None,
autoproto_extra_source='',
- aliases=None,
cflags='',
internal_module=True,
local_include=True,
+ global_include=True,
vars=None,
+ subdir=None,
enabled=True,
- pyembed=True,
+ pyembed=False,
+ allow_undefined_symbols=False
):
'''define a Samba module.'''
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ if subdir:
+ source = bld.SUBDIR(subdir, source)
if internal_module or BUILTIN_LIBRARY(bld, modname):
- # treat internal modules as subsystems for now
- if subsystem is not None:
- deps += ' ' + subsystem
-
+ # Do not create modules for disabled subsystems
+ if subsystem and GET_TARGET_TYPE(bld, subsystem) == 'DISABLED':
+ return
bld.SAMBA_SUBSYSTEM(modname, source,
deps=deps,
includes=includes,
autoproto_extra_source=autoproto_extra_source,
cflags=cflags,
local_include=local_include,
+ global_include=global_include,
enabled=enabled)
bld.ADD_INIT_FUNCTION(subsystem, modname, init_function)
SET_TARGET_TYPE(bld, modname, 'DISABLED')
return
- modnames = [modname] + TO_LIST(aliases)
- for modname in modnames:
- 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.env.shlib_PATTERN % 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,
- )
+ # Do not create modules for disabled subsystems
+ if subsystem and GET_TARGET_TYPE(bld, subsystem) == 'DISABLED':
+ 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=%s" % (init_function, module_init_name)
+
+ bld.SAMBA_LIBRARY(modname,
+ source,
+ deps=deps,
+ includes=includes,
+ cflags=cflags,
+ realname = realname,
+ autoproto = autoproto,
+ local_include=local_include,
+ global_include=global_include,
+ vars=vars,
+ link_name=build_link_name,
+ install_path="${MODULESDIR}/%s" % subsystem,
+ pyembed=pyembed,
+ allow_undefined_symbols=allow_undefined_symbols
+ )
+
Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
public_deps='',
includes='',
public_headers=None,
+ public_headers_install=True,
header_path=None,
cflags='',
cflags_end=None,
group='main',
- init_function_sentinal=None,
+ init_function_sentinel=None,
autoproto=None,
autoproto_extra_source='',
depends_on='',
local_include=True,
local_include_first=True,
+ global_include=True,
subsystem_name=None,
enabled=True,
use_hostcc=False,
use_global_deps=True,
vars=None,
+ subdir=None,
hide_symbols=False,
- pyext=False):
+ pyext=False,
+ pyembed=False):
'''define a Samba subsystem'''
if not enabled:
return
source = bld.EXPAND_VARIABLES(source, vars=vars)
+ if subdir:
+ source = bld.SUBDIR(subdir, source)
source = unique_list(TO_LIST(source))
deps += ' ' + public_deps
features = 'cc'
if pyext:
features += ' pyext'
+ if pyembed:
+ features += ' pyembed'
t = bld(
features = features,
samba_includes = includes,
local_include = local_include,
local_include_first = local_include_first,
+ global_include = global_include,
samba_subsystem= subsystem_name,
samba_use_hostcc = use_hostcc,
- samba_use_global_deps = use_global_deps
+ samba_use_global_deps = use_global_deps,
)
if cflags_end is not None:
if autoproto is not None:
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)
+ bld.PUBLIC_HEADERS(public_headers, header_path=header_path,
+ public_headers_install=public_headers_install)
return t
def SAMBA_GENERATOR(bld, name, rule, source='', target='',
group='generators', enabled=True,
public_headers=None,
+ public_headers_install=True,
header_path=None,
vars=None,
always=False):
on_results=True,
before='cc',
ext_out='.c',
+ samba_type='GENERATOR',
+ dep_vars = [rule] + (vars or []),
name=name)
if always:
t.always = True
if public_headers is not None:
- bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
+ bld.PUBLIC_HEADERS(public_headers, header_path=header_path,
+ public_headers_install=public_headers_install)
return t
Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
bld.env['USING_BUILD_GROUPS'] = True
bld.add_group('setup')
bld.add_group('build_compiler_source')
+ bld.add_group('vscripts')
bld.add_group('base_libraries')
bld.add_group('generators')
bld.add_group('compiler_prototypes')
bld.add_group('build_compilers')
bld.add_group('build_source')
bld.add_group('prototypes')
+ bld.add_group('headers')
bld.add_group('main')
+ bld.add_group('symbolcheck')
+ bld.add_group('libraries')
bld.add_group('binaries')
+ bld.add_group('syslibcheck')
bld.add_group('final')
Build.BuildContext.SETUP_BUILD_GROUPS = SETUP_BUILD_GROUPS
Utils.h_file = h_file
-
-t = Task.simple_task_type('copy_script', 'rm -f ${LINK_TARGET} && ln -s ${SRC[0].abspath(env)} ${LINK_TARGET}',
- shell=True, color='PINK', ext_in='.bin')
-t.quiet = True
-
-@feature('copy_script')
-@before('apply_link')
-def copy_script(self):
- tsk = self.create_task('copy_script', self.allnodes[0])
- tsk.env.TARGET = self.target
-
def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None):
'''used to copy scripts from the source tree into the build directory
for use by selftest'''
target = os.path.join(installdir, iname)
tgtdir = os.path.dirname(os.path.join(bld.srcnode.abspath(bld.env), '..', target))
mkdir_p(tgtdir)
- t = bld(features='copy_script',
- source = s,
- target = target,
- always = True,
- install_path = None)
- t.env.LINK_TARGET = target
-
+ link_src = os.path.normpath(os.path.join(bld.curdir, s))
+ link_dst = os.path.join(tgtdir, os.path.basename(iname))
+ if os.path.islink(link_dst) and os.readlink(link_dst) == link_src:
+ continue
+ if os.path.exists(link_dst):
+ os.unlink(link_dst)
+ Logs.info("symlink: %s -> %s/%s" % (s, installdir, iname))
+ os.symlink(link_src, link_dst)
Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
+def copy_and_fix_python_path(task):
+ pattern='sys.path.insert(0, "bin/python")'
+ if task.env["PYTHONARCHDIR"] in sys.path and task.env["PYTHONDIR"] in sys.path:
+ replacement = ""
+ elif task.env["PYTHONARCHDIR"] == task.env["PYTHONDIR"]:
+ replacement="""sys.path.insert(0, "%s")""" % task.env["PYTHONDIR"]
+ else:
+ replacement="""sys.path.insert(0, "%s")
+sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
+
+ installed_location=task.outputs[0].bldpath(task.env)
+ source_file = open(task.inputs[0].srcpath(task.env))
+ installed_file = open(installed_location, 'w')
+ for line in source_file:
+ newline = line
+ if pattern in line:
+ newline = line.replace(pattern, replacement)
+ installed_file.write(newline)
+ installed_file.close()
+ os.chmod(installed_location, 0755)
+ return 0
+
+
def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
python_fixup=False, destname=None, base_name=None):
'''install a file'''
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' < ${SRC} > ${TGT}" % regex,
+ rule=copy_and_fix_python_path,
source=file,
target=inst_file)
+ bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONARCHDIR"])
+ bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONDIR"])
file = inst_file
if base_name:
file = os.path.join(base_name, file)
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
-
- header_path may either be a string that is added to the INCLUDEDIR,
- or it can be a dictionary of wildcard patterns which map to destination
- directories relative to INCLUDEDIR
- '''
- bld.SET_BUILD_GROUP('final')
- ret = bld(features=['pubh'], headers=public_headers, header_path=header_path)
- return ret
-Build.BuildContext.PUBLIC_HEADERS = PUBLIC_HEADERS
-
-
-def subst_at_vars(task):
- '''substiture @VAR@ style variables in a file'''
- src = task.inputs[0].srcpath(task.env)
- tgt = task.outputs[0].bldpath(task.env)
-
- f = open(src, 'r')
- s = f.read()
- f.close()
- # 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):
- vname = v[1:-1]
- if not vname in task.env and vname.upper() in task.env:
- vname = vname.upper()
- if not vname in task.env:
- Logs.error("Unknown substitution %s in %s" % (v, task.name))
- sys.exit(1)
- v = SUBST_VARS_RECURSIVE(task.env[vname], task.env)
- # now we back substitute the allowed pc vars
- for (b, m) in back_sub:
- s = task.env[b]
- if s == v[0: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')
- s = f.write(contents)
- f.close()
- return 0
-
-
-
-def PKG_CONFIG_FILES(bld, pc_files, vnum=None):
- '''install some pkg_config pc files'''
- dest = '${PKGCONFIGDIR}'
- dest = bld.EXPAND_VARIABLES(dest)
- for f in TO_LIST(pc_files):
- base=os.path.basename(f)
- t = bld.SAMBA_GENERATOR('PKGCONFIG_%s' % base,
- rule=subst_at_vars,
- source=f+'.in',
- target=f)
- if vnum:
- t.env.PACKAGE_VERSION = vnum
- INSTALL_FILES(bld, dest, f, flat=True, destname=base)
-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'
if target_type in type_map:
return progress_display(self, type_map[target_type], self.name)
+ if len(self.inputs) == 0:
+ return Task.Task.old_display(self)
+
fname = self.inputs[0].bldpath(self.env)
if fname[0:3] == '../':
fname = fname[3:]
Task.TaskBase.classes['Task'].old_display = Task.TaskBase.classes['Task'].display
Task.TaskBase.classes['Task'].display = samba_display
+
+
+@after('apply_link')
+@feature('cshlib')
+def apply_bundle_remove_dynamiclib_patch(self):
+ if self.env['MACBUNDLE'] or getattr(self,'mac_bundle',False):
+ if not getattr(self,'vnum',None):
+ try:
+ self.env['LINKFLAGS'].remove('-dynamiclib')
+ self.env['LINKFLAGS'].remove('-single_module')
+ except ValueError:
+ pass
git.samba.org / kai / samba.git / blobdiff