build: a hack to get perl to put its generated blib files in the build directory

[nivanova/samba-autobuild/.git] / buildtools / wafsamba / wafsamba.py

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index ad104a2e89820aeb21e3bd818f25b0151ee89e38..1dc71b4faeef8d8a6300e803e4e4a029eeb79d62 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -1,7 +1,7 @@
 # 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
+import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch
 from Configure import conf
 from Logs import debug
 from samba_utils import SUBST_VARS_RECURSIVE
@@ -17,6 +17,7 @@ from samba_asn1 import *
 from samba_autoproto import *
 from samba_python import *
 from samba_deps import *
+import samba_conftests
 
 LIB_PATH="shared"
 
@@ -36,6 +37,14 @@ def SAMBA_BUILD_ENV(conf):
         if not os.path.lexists(link_target):
             os.symlink('../' + p, link_target)
 
+    # get perl to put the blib files in the build directory
+    blib_bld = os.path.join(conf.blddir, 'default/pidl/blib')
+    blib_src = os.path.join(conf.srcdir, 'pidl/blib')
+    mkdir_p(blib_bld + '/man1')
+    mkdir_p(blib_bld + '/man3')
+    if not os.path.lexists(blib_src):
+        os.symlink(blib_bld, blib_src)
+
 
 
 ################################################################
@@ -58,6 +67,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                   public_deps='',
                   includes='',
                   public_headers=None,
+                  header_path=None,
                   vnum=None,
                   cflags='',
                   external_library=False,
@@ -96,6 +106,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                         public_deps    = public_deps,
                         includes       = includes,
                         public_headers = public_headers,
+                        header_path    = header_path,
                         cflags         = cflags,
                         group          = group,
                         autoproto      = autoproto,
@@ -175,6 +186,9 @@ def SAMBA_LIBRARY(bld, libname, source,
     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)
+
 Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
 
 
@@ -184,6 +198,7 @@ def SAMBA_BINARY(bld, binname, source,
                  deps='',
                  includes='',
                  public_headers=None,
+                 header_path=None,
                  modules=None,
                  installdir=None,
                  ldflags=None,
@@ -289,6 +304,8 @@ def SAMBA_BINARY(bld, binname, source,
 
     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)
 Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
 
 
@@ -366,6 +383,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
                     public_deps='',
                     includes='',
                     public_headers=None,
+                    header_path=None,
                     cflags='',
                     cflags_end=None,
                     group='main',
@@ -427,13 +445,18 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
         bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source)
     if autoproto is not None:
         bld.SAMBA_AUTOPROTO(autoproto, source + ' ' + autoproto_extra_source)
+    if public_headers is not None:
+        bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
     return t
 
+
 Build.BuildContext.SAMBA_SUBSYSTEM = SAMBA_SUBSYSTEM
 
 
 def SAMBA_GENERATOR(bld, name, rule, source, target,
                     group='build_source', enabled=True,
+                    public_headers=None,
+                    header_path=None,
                     vars=None):
     '''A generic source generator target'''
 
@@ -444,7 +467,7 @@ def SAMBA_GENERATOR(bld, name, rule, source, target,
         return
 
     bld.SET_BUILD_GROUP(group)
-    bld(
+    t = bld(
         rule=rule,
         source=bld.EXPAND_VARIABLES(source, vars=vars),
         target=target,
@@ -453,6 +476,10 @@ def SAMBA_GENERATOR(bld, name, rule, source, target,
         before='cc',
         ext_out='.c',
         name=name)
+
+    if public_headers is not None:
+        bld.PUBLIC_HEADERS(public_headers, header_path=header_path)
+    return t
 Build.BuildContext.SAMBA_GENERATOR = SAMBA_GENERATOR
 
 
@@ -576,7 +603,7 @@ def symlink_bin(self):
 
 
 
-t = Task.simple_task_type('copy_script', 'rm -f && ln -s ${SRC[0].abspath(env)} ${LINK_TARGET}',
+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
 
@@ -609,3 +636,57 @@ def SAMBA_SCRIPT(bld, name, pattern, installdir, installname=None):
 
 Build.BuildContext.SAMBA_SCRIPT = SAMBA_SCRIPT
 
+
+def INSTALL_FILES(bld, destdir, files, chmod=0644, flat=False,
+                  python_fixup=False, destname=None):
+    '''install a set of files'''
+    destdir = bld.EXPAND_VARIABLES(destdir)
+    if destname:
+        bld.install_as(os.path.join(destdir,destname), files, chmod=chmod)
+    else:
+        bld.install_files(destdir, files, chmod=chmod, relative_trick=not flat)
+Build.BuildContext.INSTALL_FILES = INSTALL_FILES
+
+
+def INSTALL_WILDCARD(bld, destdir, pattern, chmod=0644, flat=False,
+                     python_fixup=False, exclude=None):
+    '''install a set of files matching a wildcard pattern'''
+    files=TO_LIST(bld.path.ant_glob(pattern))
+    if exclude:
+        for f in files[:]:
+            if fnmatch.fnmatch(f, exclude):
+                files.remove(f)
+    INSTALL_FILES(bld, destdir, files, chmod=chmod, flat=flat, python_fixup=python_fixup)
+Build.BuildContext.INSTALL_WILDCARD = INSTALL_WILDCARD
+
+
+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
+    '''
+    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)
+Build.BuildContext.PUBLIC_HEADERS = PUBLIC_HEADERS
+