[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  ab71d72138f waf: Symlink the compile database to the source dir for clangd
       via  b28d06be7a0 waf: Create clang compilation database
      from  6de5706b4db ctdb-tests: Add vacuuming tests

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


- Log -----------------------------------------------------------------
commit ab71d72138fffff5fc89b246b67cc4b82ca24f05
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Oct 22 09:32:58 2019 +0200

    waf: Symlink the compile database to the source dir for clangd
    
    https://github.com/ycm-core/YouCompleteMe
    https://github.com/abingham/emacs-ycmd
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Oct 24 08:11:19 UTC 2019 on sn-devel-184

commit b28d06be7a0b730fb893b2f208af4ff864cda166
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Sep 25 18:13:26 2018 +0200

    waf: Create clang compilation database
    
    http://clang.llvm.org/docs/JSONCompilationDatabase.html
    
    This can be used by ymcd or clangd.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 .gitignore                  | 4 ++++
 buildtools/wafsamba/wscript | 8 ++++++++
 2 files changed, 12 insertions(+)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index 1b307ca80d6..ffdb2e3bd11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,7 @@ python/samba/provision/kerberos_implementation.py
 
 # read by direnv to auto load environment variables
 .envrc
+
+# YouCompleteMe
+compile_commands.json
+.clangd/
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index ce5e0b48fc1..28d81ebd602 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -6,6 +6,7 @@ import os, sys
 from waflib import Configure, Logs, Options, Utils, Context, Errors
 import wafsamba
 from samba_utils import os_path_relpath
+from samba_utils import symlink
 from optparse import SUPPRESS_HELP
 
 # this forces configure to be re-run if any of the configure
@@ -597,6 +598,13 @@ struct foo bar = { .y = 'X', .x = 1 };
     if conf.env.enable_libfuzzer:
         conf.DEFINE('ENABLE_LIBFUZZER', 1)
 
+    conf.load('clang_compilation_database')
+
+    # Create a symlink of the compile db for clangd
+    symlink(os.path.join(conf.bldnode.abspath(), 'default/compile_commands.json'),
+            os.path.join(conf.srcnode.abspath(), 'compile_commands.json'),
+            force=True)
+
     conf.SAMBA_BUILD_ENV()
 
 


-- 
Samba Shared Repository