build: support variable expansion in source= arguments to build rules
[nivanova/samba-autobuild/.git] / buildtools / wafsamba / wafsamba.py
index bfe20ce5ebda1729aa3737478ac3bb4179337bf3..ad104a2e89820aeb21e3bd818f25b0151ee89e38 100644 (file)
@@ -20,7 +20,7 @@ from samba_deps import *
 
 LIB_PATH="shared"
 
-
+os.putenv('PYTHONUNBUFFERED', '1')
 
 #################################################################
 # create the samba build environment
@@ -66,6 +66,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                   group='main',
                   depends_on='',
                   local_include=True,
+                  vars=None,
                   install_path=None,
                   install=True,
                   enabled=True):
@@ -74,6 +75,8 @@ def SAMBA_LIBRARY(bld, libname, source,
         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 == []):
         SET_TARGET_TYPE(bld, libname, 'EMPTY')
@@ -121,21 +124,29 @@ def SAMBA_LIBRARY(bld, libname, source,
         samba_includes  = includes,
         local_include   = local_include,
         vnum            = vnum,
-        install_path    = None
+        install_path    = None,
+        ldflags         = build_rpath(bld)
         )
 
     if install_path is None:
         install_path = '${LIBDIR}'
     install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
 
-    if install:
+    # 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, libname + '.inst', 'LIBRARY')
+        SET_TARGET_TYPE(bld, install_target, 'LIBRARY')
         t = bld(
             features        = 'cc cshlib',
             source          = [],
-            target          = libname + '.inst',
+            target          = install_target,
             samba_cflags    = CURRENT_CFLAGS(bld, libname, cflags),
             depends_on      = depends_on,
             samba_deps      = deps,
@@ -144,9 +155,10 @@ def SAMBA_LIBRARY(bld, libname, source,
             vnum            = vnum,
             install_as     = libname,
             install_path    = None,
+            ldflags         = install_rpath(bld)
             )
-        t.env['RPATH'] = install_rpath(bld)
 
+    if install:
         if vnum:
             vnum_base = vnum.split('.')[0]
             install_name = 'lib%s.so.%s' % (libname, vnum)
@@ -160,7 +172,6 @@ def SAMBA_LIBRARY(bld, libname, source,
         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)
 
@@ -185,6 +196,7 @@ def SAMBA_BINARY(bld, binname, source,
                  local_include=True,
                  subsystem_name=None,
                  needs_python=False,
+                 vars=None,
                  install=True,
                  install_path=None):
 
@@ -199,6 +211,8 @@ def SAMBA_BINARY(bld, binname, source,
 
     obj_target = binname + '.objlist'
 
+    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
@@ -228,21 +242,29 @@ def SAMBA_BINARY(bld, binname, source,
         samba_modules  = modules,
         top            = True,
         samba_subsystem= subsystem_name,
-        install_path   = None
+        install_path   = None,
+        ldflags        = build_rpath(bld)
         )
 
     if install_path is None:
         install_path = '${BINDIR}'
     install_path = SUBST_VARS_RECURSIVE(install_path, bld.env)
 
-    if install:
+    # 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, binname + '.inst', 'BINARY')
+        SET_TARGET_TYPE(bld, install_target, 'BINARY')
         t = bld(
             features       = features,
             source         = [],
-            target         = binname + '.inst',
+            target         = install_target,
             samba_cflags   = CURRENT_CFLAGS(bld, binname, cflags),
             samba_deps     = deps,
             samba_includes = includes,
@@ -250,12 +272,13 @@ def SAMBA_BINARY(bld, binname, source,
             samba_modules  = modules,
             top            = True,
             samba_subsystem= subsystem_name,
-            install_path   = None
+            install_path   = None,
+            ldflags        = install_rpath(bld)
             )
-        t.env['RPATH'] = install_rpath(bld)
 
+    if install:
         bld.install_as(os.path.join(install_path, binname),
-                       binname + '.inst',
+                       install_target,
                        chmod=0755)
 
     # setup the subsystem_name as an alias for the real
@@ -282,6 +305,7 @@ def SAMBA_MODULE(bld, modname, source,
                  cflags='',
                  internal_module=True,
                  local_include=True,
+                 vars=None,
                  enabled=True):
 
     # we add the init function regardless of whether the module
@@ -305,6 +329,8 @@ def SAMBA_MODULE(bld, modname, source,
         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')
@@ -354,6 +380,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
                     local_include_first=True,
                     subsystem_name=None,
                     enabled=True,
+                    vars=None,
                     needs_python=False):
 
     if not enabled:
@@ -368,6 +395,8 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
     if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'):
         return
 
+    source = bld.EXPAND_VARIABLES(source, vars=vars)
+
     deps += ' ' + public_deps
 
     bld.SET_BUILD_GROUP(group)
@@ -404,20 +433,23 @@ Build.BuildContext.SAMBA_SUBSYSTEM = SAMBA_SUBSYSTEM
 
 
 def SAMBA_GENERATOR(bld, name, rule, source, target,
-                    group='build_source', enabled=True):
+                    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 False
+        return
 
     bld.SET_BUILD_GROUP(group)
     bld(
         rule=rule,
-        source=source,
+        source=bld.EXPAND_VARIABLES(source, vars=vars),
         target=target,
+        shell=True,
+        on_results=True,
         before='cc',
         ext_out='.c',
         name=name)
@@ -455,6 +487,7 @@ 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')
@@ -493,8 +526,8 @@ def ENABLE_TIMESTAMP_DEPENDENCIES(conf):
 # 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', 'ln -sf ${LINK_SOURCE} ${LINK_TARGET}',
-                          color='PINK', ext_in='.bin')
+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')
@@ -522,8 +555,8 @@ def symlink_lib(self):
           self.name, tsk.env.LINK_SOURCE, tsk.env.LINK_TARGET)
 
 
-t = Task.simple_task_type('symlink_bin', 'ln -sf ${SRC} ${BIN_TARGET}',
-                          color='PINK', ext_in='.bin')
+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')
@@ -543,8 +576,8 @@ def symlink_bin(self):
 
 
 
-t = Task.simple_task_type('copy_script', 'ln -sf ${SRC[0].abspath(env)} ${LINK_TARGET}',
-                          color='PINK', ext_in='.bin', shell=True)
+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')