[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Sat Sep 4 07:00:43 MDT 2010


The branch, master has been updated
       via  72f3727 dsdb: Add missing dependencies for dsdb ldb modules.
       via  84c1874 waf: Support aliases in SAMBA_MODULE.
       via  1ba533f waf: Make shared modules available in the build dir.
      from  54d2dce librpc/rpc: add dcerpc_binding_handle_set_timeout()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 72f3727464ff0f1116546a6eb61cdb8ee6872003
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 4 03:42:52 2010 +0200

    dsdb: Add missing dependencies for dsdb ldb modules.

commit 84c1874677b27e76f2acb3640b867aaebbb9b343
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 4 03:42:37 2010 +0200

    waf: Support aliases in SAMBA_MODULE.

commit 1ba533f4cb7a7274a3c49dd69a30e20f579738a2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Sep 4 02:18:31 2010 +0200

    waf: Make shared modules available in the build dir.

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_install.py         |    5 ++
 buildtools/wafsamba/wafsamba.py              |   55 ++++++++++++++------------
 source4/dsdb/samdb/ldb_modules/wscript_build |    4 +-
 3 files changed, 37 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index 488729b..f4ca263 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -150,6 +150,11 @@ def symlink_lib(self):
         if os.path.islink(link_target) and os.readlink(link_target) == libpath:
             return
         os.unlink(link_target)
+
+    link_container = os.path.dirname(link_target)
+    if not os.path.isdir(link_container):
+        os.mkdir(link_container)
+
     os.symlink(libpath, link_target)
 
 
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c24d82b..80a6f71 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -59,7 +59,7 @@ def SAMBA_BUILD_ENV(conf):
     # this allows all of the bin/shared and bin/python targets
     # to be expressed in terms of build directory paths
     mkdir_p(os.path.join(conf.blddir, 'default'))
-    for p in ['python','shared']:
+    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)
@@ -349,30 +349,35 @@ def SAMBA_MODULE(bld, modname, source,
         SET_TARGET_TYPE(bld, modname, '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.env.shlib_PATTERN % realname
-    while realname.startswith("lib"):
-        realname = realname[len("lib"):]
-
-    bld.SAMBA_LIBRARY(modname,
-                      source,
-                      deps=deps,
-                      cflags=cflags,
-                      realname = realname,
-                      autoproto = autoproto,
-                      local_include=local_include,
-                      vars=vars,
-                      install_path="${MODULESDIR}/%s" % subsystem
-                      )
+    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)
+
+        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
+                          )
 
 Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE
 
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 05a8641..c8461d6 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -184,7 +184,7 @@ bld.SAMBA_MODULE('ldb_show_deleted',
 	subsystem='ldb',
 	init_function='LDB_MODULE(show_deleted)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
 	)
 
 
@@ -239,7 +239,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename',
 	subsystem='ldb',
 	init_function='LDB_MODULE(subtree_rename)',
 	internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-	deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb SAMDB_COMMON'
 	)
 
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list