build: support variable expansion in source= arguments to build rules
[nivanova/samba-autobuild/.git] / buildtools / wafsamba / wafsamba.py
index 2498eedd75a64aa198c24c976c8085f248ed24e6..ad104a2e89820aeb21e3bd818f25b0151ee89e38 100644 (file)
 # a waf tool to add autoconf-like macros to the configure section
 # and for SAMBA_ macros for building libraries, binaries etc
 
-import Build, os, Logs, sys, Configure, Options, string, Task, Utils, optparse
+import Build, os, Options, Task, Utils, cc, TaskGen
 from Configure import conf
 from Logs import debug
-from TaskGen import extension
+from samba_utils import SUBST_VARS_RECURSIVE
 
 # bring in the other samba modules
+from samba_optimisation import *
 from samba_utils import *
-# should be enabled from the above?
 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 *
 
 LIB_PATH="shared"
 
+os.putenv('PYTHONUNBUFFERED', '1')
 
 #################################################################
 # create the samba build environment
 @conf
 def SAMBA_BUILD_ENV(conf):
-    libpath="%s/%s" % (conf.blddir, LIB_PATH)
     conf.env['BUILD_DIRECTORY'] = conf.blddir
-    if not os.path.exists(libpath):
-        os.mkdir(libpath)
+    mkdir_p(os.path.join(conf.blddir, LIB_PATH))
+    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']:
+        link_target = os.path.join(conf.blddir, 'default/' + p)
+        if not os.path.lexists(link_target):
+            os.symlink('../' + p, link_target)
+
+
 
 ################################################################
 # add an init_function to the list for a subsystem
-def ADD_INIT_FUNCTION(bld, subsystem, init_function):
+def ADD_INIT_FUNCTION(bld, subsystem, target, init_function):
     if init_function is None:
         return
     bld.ASSERT(subsystem is not None, "You must specify a subsystem for init_function '%s'" % init_function)
     cache = LOCAL_CACHE(bld, 'INIT_FUNCTIONS')
     if not subsystem in cache:
-        cache[subsystem] = ''
-    cache[subsystem] += '%s,' % init_function
+        cache[subsystem] = []
+    cache[subsystem].append( { 'TARGET':target, 'INIT_FUNCTION':init_function } )
 Build.BuildContext.ADD_INIT_FUNCTION = ADD_INIT_FUNCTION
 
-################################################################
-# recursively build the dependency list for a target
-def FULL_DEPENDENCIES(bld, cache, target, chain, path):
-    if not target in cache:
-        return {}
-    deps = cache[target].copy()
-    for t in cache[target]:
-        bld.ASSERT(t not in chain, "Circular dependency for %s: %s->%s" % (t, path, t));
-        c2 = chain.copy()
-        c2[t] = True
-        dict_concat(deps, FULL_DEPENDENCIES(bld, cache, t, c2, "%s->%s" % (path, t)))
-    return deps
-
-############################################################
-# check our build dependencies for circular dependencies
-def CHECK_TARGET_DEPENDENCY(bld, target):
-    cache = LOCAL_CACHE(bld, 'LIB_DEPS')
-    return FULL_DEPENDENCIES(bld, cache, target, { target:True }, target)
-
-############################################################
-# check that all dependencies have been declared
-def CHECK_DEPENDENCIES(bld):
-    cache = LOCAL_CACHE(bld, 'LIB_DEPS')
-    target_cache = LOCAL_CACHE(bld, 'TARGET_TYPE')
-    debug('deps: Checking dependencies')
-    for t in cache:
-        deps = CHECK_TARGET_DEPENDENCY(bld, t)
-        for d in deps:
-            #if not d in target_cache:
-            #    print "WARNING: Dependency '%s' of target '%s' not declared" % (d, t)
-            ASSERT(bld, d in target_cache,
-                   "Dependency '%s' of target '%s' not declared" % (d, t))
-    debug("deps: Dependencies checked for %u targets" % len(target_cache))
-Build.BuildContext.CHECK_DEPENDENCIES = CHECK_DEPENDENCIES
-
-
-############################################################
-# pre-declare a target as being of a particular type
-def PREDECLARE(bld, target, type):
-    cache = LOCAL_CACHE(bld, 'PREDECLARED_TARGET')
-    target_cache = LOCAL_CACHE(bld, 'TARGET_TYPE')
-    ASSERT(bld, not target in target_cache, "Target '%s' is already declared" % target)
-    ASSERT(bld, not target in cache, "Target '%s' already predeclared" % target)
-    cache[target] = type
-Build.BuildContext.PREDECLARE = PREDECLARE
-
-
-
-################################################################
-# add to the dependency list. Return a new dependency list with
-# any circular dependencies removed
-# returns a tuple containing (systemdeps, localdeps, add_objects)
-def ADD_DEPENDENCIES(bld, name, deps):
-    debug('deps: Calculating dependencies for %s' % name)
-    lib_deps = LOCAL_CACHE(bld, 'LIB_DEPS')
-    if not name in lib_deps:
-        lib_deps[name] = {}
-    list = to_list(deps)
-    list2 = []
-    for d in list:
-        lib_deps[name][d] = True;
-        try:
-            CHECK_TARGET_DEPENDENCY(bld, name)
-            list2.append(d)
-        except AssertionError:
-            sys.stderr.write("Removing dependency %s from target %s\n" % (d, name))
-            del(lib_deps[name][d])
-
-    target_cache = LOCAL_CACHE(bld, 'TARGET_TYPE')
-
-    # extract out the system dependencies
-    sysdeps = []
-    localdeps = []
-    add_objects = []
-    cache = LOCAL_CACHE(bld, 'EMPTY_TARGETS')
-    predeclare = LOCAL_CACHE(bld, 'PREDECLARED_TARGET')
-    for d in list2:
-        recurse = False
-        # strip out any dependencies on empty libraries
-        if d in cache:
-            debug("deps: Removing empty dependency '%s' from '%s'" % (d, name))
-            continue
-        type = None
-
-        if d in target_cache:
-            type = target_cache[d]
-        elif d in predeclare:
-            type = predeclare[d]
-        else:
-            type = 'SUBSYSTEM'
-            LOCAL_CACHE_SET(bld, 'ASSUMED_TARGET', d, type)
-
-        if type == 'SYSLIB':
-            sysdeps.append(d)
-        elif type == 'LIBRARY':
-            localdeps.append(d)
-        elif type == 'SUBSYSTEM':
-            add_objects.append(d)
-            recurse = True
-        elif type == 'MODULE':
-            add_objects.append(d)
-            recurse = True
-        elif type == 'PYTHON':
-            pass
-        elif type == 'ASN1':
-            pass
-        elif type == 'BINARY':
-            pass
-        else:
-            ASSERT(bld, False, "Unknown target type '%s' for dependency %s" % (
-                    type, d))
-
-        # for some types we have to build the list recursively
-        if recurse and (d in lib_deps):
-            rec_deps = ' '.join(lib_deps[d].keys())
-            (rec_sysdeps, rec_localdeps, rec_add_objects) = ADD_DEPENDENCIES(bld, d, rec_deps)
-            sysdeps.extend(to_list(rec_sysdeps))
-            localdeps.extend(to_list(rec_localdeps))
-            add_objects.extend(to_list(rec_add_objects))
-
-    debug('deps: Dependencies for %s: sysdeps: %u  localdeps: %u  add_objects=%u' % (
-            name, len(sysdeps), len(localdeps), len(add_objects)))
-    return (' '.join(sysdeps), ' '.join(localdeps), ' '.join(add_objects))
-
-
-#################################################################
-# return a include list for a set of library dependencies
-def SAMBA_LIBRARY_INCLUDE_LIST(bld, deps):
-    ret = bld.curdir + ' '
-    cache = LOCAL_CACHE(bld, 'INCLUDE_LIST')
-    for l in to_list(deps):
-        if l in cache:
-            ret = ret + cache[l] + ' '
-    if 'EXTRA_INCLUDES' in bld.env:
-        ret += ' ' + ' '.join(bld.env['EXTRA_INCLUDES'])
-    return ret
-Build.BuildContext.SAMBA_LIBRARY_INCLUDE_LIST = SAMBA_LIBRARY_INCLUDE_LIST
 
 #################################################################
 # define a Samba library
 def SAMBA_LIBRARY(bld, libname, source,
                   deps='',
                   public_deps='',
-                  includes='.',
+                  includes='',
                   public_headers=None,
                   vnum=None,
                   cflags='',
-                  output_type=None,
+                  external_library=False,
                   realname=None,
                   autoproto=None,
                   group='main',
-                  depends_on=''):
-    if not SET_TARGET_TYPE(bld, libname, 'LIBRARY'):
+                  depends_on='',
+                  local_include=True,
+                  vars=None,
+                  install_path=None,
+                  install=True,
+                  enabled=True):
+
+    if not enabled:
+        SET_TARGET_TYPE(bld, libname, 'DISABLED')
         return
 
+    source = bld.EXPAND_VARIABLES(source, vars=vars)
+
     # remember empty libraries, so we can strip the dependencies
     if (source == '') or (source == []):
-        LOCAL_CACHE_SET(bld, 'EMPTY_TARGETS', libname, True)
+        SET_TARGET_TYPE(bld, libname, 'EMPTY')
         return
 
-    (sysdeps, localdeps, add_objects) = ADD_DEPENDENCIES(bld, libname, deps)
-
-#    bld.SET_TARGET_INCLUDE_LIST(libname, includes)
+    if bld.env.DISABLE_SHARED:
+        obj_target = libname
+    else:
+        obj_target = libname + '.objlist'
+
+    # 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
+    bld.SAMBA_SUBSYSTEM(obj_target,
+                        source         = source,
+                        deps           = deps,
+                        public_deps    = public_deps,
+                        includes       = includes,
+                        public_headers = public_headers,
+                        cflags         = cflags,
+                        group          = group,
+                        autoproto      = autoproto,
+                        depends_on     = depends_on,
+                        local_include  = local_include)
+
+    if bld.env.DISABLE_SHARED:
+        return
 
-    ilist = includes + ' ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps)
-    ilist = bld.NORMPATH(ilist)
+    if not SET_TARGET_TYPE(bld, libname, 'LIBRARY'):
+        return
 
-#    print "LIBRARY %s add_objects=%s deps=%s uselib_local=%s ilist=%s" % (libname, add_objects, deps, localdeps, ilist)
-
-    # this print below should show that we're runnig this code
-    bld.SET_BUILD_GROUP(group)   # <- here
-    bld(
-        features = 'cc cshlib',
-        source = source,
-        target=libname,
-        uselib_local = localdeps,
-        uselib = sysdeps,
-        add_objects = add_objects,
-        ccflags = CURRENT_CFLAGS(bld, cflags),
-        includes=ilist + ' . #',
-        export_incdirs = includes,
-        depends_on=depends_on,
-        vnum=vnum)
-
-    # I have to set it each time? I expect it to be still
-    # set from the few lines above
-
-    # put a link to the library in bin/shared
-    soext=""
-    if vnum is not None:
-        soext = '.' + vnum.split('.')[0]
+    # the library itself will depend on that object target
+    deps += ' ' + public_deps
+    deps = TO_LIST(deps)
+    deps.append(obj_target)
 
+    bld.SET_BUILD_GROUP(group)
     t = bld(
-        source = 'lib%s.so' % libname,
-        rule = 'ln -sf ../${SRC}%s %s/lib%s.so%s' % (soext, LIB_PATH, libname, soext),
-#        rule = 'ln -sf ../%s.so%s %s/lib%s.so%s' % (libname, soext, LIB_PATH, libname, soext),
-        shell = True,
-        after = 'cc_link',
-        always = True,
-       name = libname + '.link',
+        features        = 'cc cshlib symlink_lib',
+        source          = [],
+        target          = libname,
+        samba_cflags    = CURRENT_CFLAGS(bld, libname, cflags),
+        depends_on      = depends_on,
+        samba_deps      = deps,
+        samba_includes  = includes,
+        local_include   = local_include,
+        vnum            = vnum,
+        install_path    = None,
+        ldflags         = build_rpath(bld)
         )
-    #print t.rule
-    LOCAL_CACHE_SET(bld, 'INCLUDE_LIST', libname, ilist)
+
+    if install_path is None:
+        install_path = '${LIBDIR}'
+    install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
+
+    # we don't need the double libraries if rpath is off
+    if (bld.env.RPATH_ON_INSTALL == False and
+        bld.env.RPATH_ON_BUILD == False):
+        install_target = libname
+    else:
+        install_target = libname + '.inst'
+
+    if install and install_target != libname:
+        # create a separate install library, which may have
+        # different rpath settings
+        SET_TARGET_TYPE(bld, install_target, 'LIBRARY')
+        t = bld(
+            features        = 'cc cshlib',
+            source          = [],
+            target          = install_target,
+            samba_cflags    = CURRENT_CFLAGS(bld, libname, cflags),
+            depends_on      = depends_on,
+            samba_deps      = deps,
+            samba_includes  = includes,
+            local_include   = local_include,
+            vnum            = vnum,
+            install_as     = libname,
+            install_path    = None,
+            ldflags         = install_rpath(bld)
+            )
+
+    if install:
+        if vnum:
+            vnum_base = vnum.split('.')[0]
+            install_name = 'lib%s.so.%s' % (libname, vnum)
+            install_link = 'lib%s.so.%s' % (libname, vnum_base)
+        else:
+            install_name = 'lib%s.so' % libname
+            install_link = None
+
+        bld.install_as(os.path.join(install_path, install_name),
+                       'lib%s.inst.so' % libname)
+        if install_link:
+            bld.symlink_as(os.path.join(install_path, install_link), install_name)
+
+    if autoproto is not None:
+        bld.SAMBA_AUTOPROTO(autoproto, source)
 
 Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
 
+
 #################################################################
 # define a Samba binary
 def SAMBA_BINARY(bld, binname, source,
@@ -258,115 +191,171 @@ def SAMBA_BINARY(bld, binname, source,
                  autoproto=None,
                  use_hostcc=None,
                  compiler=None,
-                 group='main',
-                 manpages=None):
-    ilist = includes + ' ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps)
-    ilist = bld.NORMPATH(ilist)
+                 group='binaries',
+                 manpages=None,
+                 local_include=True,
+                 subsystem_name=None,
+                 needs_python=False,
+                 vars=None,
+                 install=True,
+                 install_path=None):
 
     if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
         return
 
-    (sysdeps, localdeps, add_objects) = ADD_DEPENDENCIES(bld, binname, deps)
+    features = 'cc cprogram'
+    if needs_python:
+        features += ' pyembed'
 
-    cache = LOCAL_CACHE(bld, 'INIT_FUNCTIONS')
-    if modules is not None:
-        for m in to_list(modules):
-            bld.ASSERT(m in cache,
-                       "No init_function defined for module '%s' in binary '%s'" % (m, binname))
-            cflags += ' -DSTATIC_%s_MODULES="%s"' % (m, cache[m])
+    bld.SET_BUILD_GROUP(group)
 
-#    print "BINARY %s add_objects=%s deps=%s uselib_local=%s" % (binname, add_objects, deps, localdeps)
+    obj_target = binname + '.objlist'
 
-    bld.SET_BUILD_GROUP(group)
-    bld(
-        features = 'cc cprogram',
-        source = source,
-        target = binname,
-        uselib_local = localdeps,
-        uselib = sysdeps,
-        includes = ilist + ' . #',
-        ccflags = CURRENT_CFLAGS(bld, cflags),
-        add_objects = add_objects,
-        top=True)
-
-    if not Options.is_install:
-        bld(
-            source = binname,
-            rule = 'rm -f %s && cp ${SRC} .' % (binname),
-            shell = True,
-            after = 'cc_link',
-            always = True,
-            ext_in = '.bin',
-            name = binname + ".copy",
-            depends_on = binname
-            )
-Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
+    source = bld.EXPAND_VARIABLES(source, vars=vars)
 
+    # 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
+    bld.SAMBA_SUBSYSTEM(obj_target,
+                        source         = source,
+                        deps           = deps,
+                        includes       = includes,
+                        cflags         = cflags,
+                        group          = group,
+                        autoproto      = autoproto,
+                        subsystem_name = subsystem_name,
+                        needs_python   = needs_python,
+                        local_include  = local_include)
 
-#################################################################
-# define a Samba python module
-def SAMBA_PYTHON(bld, name, source,
-                 deps='',
-                 public_deps='',
-                 realname=''):
+    # the library itself will depend on that object target
+    deps = TO_LIST(deps)
+    deps.append(obj_target)
 
-    if not SET_TARGET_TYPE(bld, name, 'PYTHON'):
-        return
+    bld(
+        features       = features + ' symlink_bin',
+        source         = [],
+        target         = binname,
+        samba_cflags   = CURRENT_CFLAGS(bld, binname, cflags),
+        samba_deps     = deps,
+        samba_includes = includes,
+        local_include  = local_include,
+        samba_modules  = modules,
+        top            = True,
+        samba_subsystem= subsystem_name,
+        install_path   = None,
+        ldflags        = build_rpath(bld)
+        )
 
-    (sysdeps, localdeps, add_objects) = ADD_DEPENDENCIES(bld, name, deps)
+    if install_path is None:
+        install_path = '${BINDIR}'
+    install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
+
+    # we don't need the double binaries if rpath is off
+    if (bld.env.RPATH_ON_INSTALL == False and
+        bld.env.RPATH_ON_BUILD == False):
+        install_target = binname
+    else:
+        install_target = binname + '.inst'
+
+    if install and install_target != binname:
+        # we create a separate 'install' binary, which
+        # will have different rpath settings
+        SET_TARGET_TYPE(bld, install_target, 'BINARY')
+        t = bld(
+            features       = features,
+            source         = [],
+            target         = install_target,
+            samba_cflags   = CURRENT_CFLAGS(bld, binname, cflags),
+            samba_deps     = deps,
+            samba_includes = includes,
+            local_include  = local_include,
+            samba_modules  = modules,
+            top            = True,
+            samba_subsystem= subsystem_name,
+            install_path   = None,
+            ldflags        = install_rpath(bld)
+            )
 
-    return
-Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
+    if install:
+        bld.install_as(os.path.join(install_path, binname),
+                       install_target,
+                       chmod=0755)
+
+    # 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 autoproto is not None:
+        bld.SAMBA_AUTOPROTO(autoproto, source)
+Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
 
-#################################################################
-# define a Samba ET target
-def SAMBA_ERRTABLE(bld, name, source,
-               options='',
-               directory=''):
-#    print "Skipping ERRTABLE rule for %s with source=%s" % (name, source)
-#    return
-    if not SET_TARGET_TYPE(bld, name, 'ET'):
-        return
-    bld.SET_BUILD_GROUP('build_source')
-    bld(
-        features = 'cc',
-        source   = source,
-        target   = name,
-        includes = '# #source4/heimdal_build #source4 #lib/replace'
-    )
-Build.BuildContext.SAMBA_ERRTABLE = SAMBA_ERRTABLE
 
 #################################################################
 # define a Samba module.
 def SAMBA_MODULE(bld, modname, source,
                  deps='',
-                 includes='.',
+                 includes='',
                  subsystem=None,
                  init_function=None,
                  autoproto=None,
+                 autoproto_extra_source='',
                  aliases=None,
                  cflags='',
-                 output_type=None):
+                 internal_module=True,
+                 local_include=True,
+                 vars=None,
+                 enabled=True):
+
+    # 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)
+
+    if internal_module or bld.env.DISABLE_SHARED:
+        # 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)
+        return
 
-    if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
+    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 == []):
-        LOCAL_CACHE_SET(bld, 'EMPTY_TARGETS', modname, True)
+        SET_TARGET_TYPE(bld, modname, 'EMPTY')
+        return
+
+    if not SET_TARGET_TYPE(bld, modname, 'MODULE'):
         return
 
-    (sysdeps, localdeps, add_objects) = ADD_DEPENDENCIES(bld, modname, deps)
+    if subsystem is not None:
+        deps += ' ' + subsystem
 
-    ilist = includes + ' ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps)
-    ilist = bld.NORMPATH(ilist)
     bld.SET_BUILD_GROUP('main')
     bld(
-        features = 'cc',
-        source = source,
-        target=modname,
-        ccflags = CURRENT_CFLAGS(bld, cflags),
-        includes=ilist + ' . #')
+        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
 
 
@@ -375,55 +364,99 @@ Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
 def SAMBA_SUBSYSTEM(bld, modname, source,
                     deps='',
                     public_deps='',
-                    includes='.',
+                    includes='',
                     public_headers=None,
                     cflags='',
+                    cflags_end=None,
                     group='main',
-                    config_option=None,
                     init_function_sentinal=None,
                     heimdal_autoproto=None,
+                    heimdal_autoproto_options=None,
                     heimdal_autoproto_private=None,
                     autoproto=None,
-                    depends_on=''):
-
-    if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'):
+                    autoproto_extra_source='',
+                    depends_on='',
+                    local_include=True,
+                    local_include_first=True,
+                    subsystem_name=None,
+                    enabled=True,
+                    vars=None,
+                    needs_python=False):
+
+    if not enabled:
+        SET_TARGET_TYPE(bld, modname, 'DISABLED')
         return
 
-    # if the caller specifies a config_option, then we create a blank
-    # subsystem if that configuration option was found at configure time
-    if (config_option is not None) and bld.CONFIG_SET(config_option):
-            source = ''
-
     # remember empty subsystems, so we can strip the dependencies
     if (source == '') or (source == []):
-        LOCAL_CACHE_SET(bld, 'EMPTY_TARGETS', modname, True)
+        SET_TARGET_TYPE(bld, modname, 'EMPTY')
         return
 
-    (sysdeps, localdeps, add_objects) = ADD_DEPENDENCIES(bld, modname, deps)
+    if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'):
+        return
+
+    source = bld.EXPAND_VARIABLES(source, vars=vars)
+
+    deps += ' ' + public_deps
 
-    ilist = includes + ' ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps)
-    ilist = bld.NORMPATH(ilist)
     bld.SET_BUILD_GROUP(group)
+
+    features = 'cc'
+    if needs_python:
+        features += ' pyext'
+
     t = bld(
-        features = 'cc',
-        source = source,
-        target=modname,
-        ccflags = CURRENT_CFLAGS(bld, cflags),
-        includes=ilist + ' . #',
-        depends_on=depends_on)
-    LOCAL_CACHE_SET(bld, 'INCLUDE_LIST', modname, ilist)
+        features       = features,
+        source         = source,
+        target         = modname,
+        samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags),
+        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
+        )
+
+    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)
+        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)
+        bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
     return t
 
 Build.BuildContext.SAMBA_SUBSYSTEM = SAMBA_SUBSYSTEM
 
 
+def SAMBA_GENERATOR(bld, name, rule, source, target,
+                    group='build_source', enabled=True,
+                    vars=None):
+    '''A generic source generator target'''
+
+    if not SET_TARGET_TYPE(bld, name, 'GENERATOR'):
+        return
+
+    if not enabled:
+        return
+
+    bld.SET_BUILD_GROUP(group)
+    bld(
+        rule=rule,
+        source=bld.EXPAND_VARIABLES(source, vars=vars),
+        target=target,
+        shell=True,
+        on_results=True,
+        before='cc',
+        ext_out='.c',
+        name=name)
+Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
+
+
+
 ###############################################################
 # add a new set of build rules from a subdirectory
 # the @runonce decorator ensures we don't end up
@@ -454,11 +487,13 @@ def SETUP_BUILD_GROUPS(bld):
     bld.p_ln = bld.srcnode # we do want to see all targets!
     bld.env['USING_BUILD_GROUPS'] = True
     bld.add_group('setup')
+    bld.add_group('build_compiler_source')
     bld.add_group('base_libraries')
     bld.add_group('build_compilers')
     bld.add_group('build_source')
     bld.add_group('prototypes')
     bld.add_group('main')
+    bld.add_group('binaries')
     bld.add_group('final')
 Build.BuildContext.SETUP_BUILD_GROUPS = SETUP_BUILD_GROUPS
 
@@ -471,3 +506,106 @@ def SET_BUILD_GROUP(bld, group):
     bld.set_group(group)
 Build.BuildContext.SET_BUILD_GROUP = SET_BUILD_GROUP
 
+
+def h_file(filename):
+    import stat
+    st = os.stat(filename)
+    if stat.S_ISDIR(st[stat.ST_MODE]): raise IOError('not a file')
+    m = Utils.md5()
+    m.update(str(st.st_mtime))
+    m.update(str(st.st_size))
+    m.update(filename)
+    return m.digest()
+
+@conf
+def ENABLE_TIMESTAMP_DEPENDENCIES(conf):
+    Utils.h_file = h_file
+
+
+##############################
+# handle the creation of links for libraries and binaries
+# note that we use a relative symlink path to allow the whole tree
+# to me moved/copied elsewhere without breaking the links
+t = Task.simple_task_type('symlink_lib', 'rm -f ${LINK_TARGET} && ln -s ${LINK_SOURCE} ${LINK_TARGET}',
+                          shell=True, color='PINK', ext_in='.bin')
+t.quiet = True
+
+@feature('symlink_lib')
+@after('apply_link')
+def symlink_lib(self):
+    tsk = self.create_task('symlink_lib', self.link_task.outputs[0])
+
+    # calculat the link target and put it in the environment
+    soext=""
+    vnum = getattr(self, 'vnum', None)
+    if vnum is not None:
+        soext = '.' + vnum.split('.')[0]
+
+    link_target = getattr(self, 'link_name', '')
+    if link_target == '':
+        link_target = '%s/lib%s.so%s' % (LIB_PATH, self.sname, soext)
+
+
+    link_source = os_path_relpath(self.link_task.outputs[0].abspath(self.env),
+                                  os.path.join(self.env.BUILD_DIRECTORY, link_target))
+
+    tsk.env.LINK_TARGET = link_target
+    tsk.env.LINK_SOURCE = link_source[3:]
+    debug('task_gen: LINK for %s is %s -> %s',
+          self.name, tsk.env.LINK_SOURCE, tsk.env.LINK_TARGET)
+
+
+t = Task.simple_task_type('symlink_bin', 'rm -f ${BIN_TARGET} && ln -s ${SRC} ${BIN_TARGET}',
+                          shell=True, color='PINK', ext_in='.bin')
+t.quiet = True
+
+@feature('symlink_bin')
+@after('apply_link')
+def symlink_bin(self):
+    if Options.is_install:
+        # we don't want to copy the install binary, as
+        # that has the install rpath, not the build rpath
+        # The rpath of the binaries in bin/default/foo/blah is different
+        # during the install phase, as distros insist on not using rpath in installed binaries
+        return
+    tsk = self.create_task('symlink_bin', self.link_task.outputs[0])
+
+    tsk.env.BIN_TARGET = self.target
+    debug('task_gen: BIN_TARGET for %s is %s', self.name, tsk.env.BIN_TARGET)
+
+
+
+
+t = Task.simple_task_type('copy_script', 'rm -f && 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'''
+
+    source = bld.path.ant_glob(pattern)
+
+    bld.SET_BUILD_GROUP('build_source')
+    for s in TO_LIST(source):
+        iname = s
+        if installname != None:
+            iname = installname
+        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
+
+Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
+