diff options
author | Stefan Metzmacher <metze@samba.org> | 2022-01-21 17:05:57 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2022-01-21 23:33:36 +0000 |
commit | 85dbc023c300a651e7802b9ebb1f08b4c2f56e8b (patch) | |
tree | 73b67cc6b45011476178ab891eeaa63393687a78 | |
parent | 82a21581c63fc4e453fd4f5cd44e77a95c84f50c (diff) | |
download | samba-85dbc023c300a651e7802b9ebb1f08b4c2f56e8b.tar.gz |
wafsamba: Remove clangdb code which doesn't work
This generates an incomplete database where defines and includes are missing.
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r-- | buildtools/wafsamba/samba_deps.py | 12 | ||||
-rw-r--r-- | buildtools/wafsamba/samba_utils.py | 3 | ||||
-rw-r--r-- | wscript_build_embedded_heimdal | 3 | ||||
-rw-r--r-- | wscript_build_system_heimdal | 3 | ||||
-rw-r--r-- | wscript_build_system_mitkrb5 | 3 |
5 files changed, 5 insertions, 19 deletions
diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py index 81979e291a7..f8df6ada0af 100644 --- a/buildtools/wafsamba/samba_deps.py +++ b/buildtools/wafsamba/samba_deps.py @@ -2,7 +2,7 @@ import os, sys, re -from waflib import Build, Options, Logs, Utils, Errors, Scripting +from waflib import Build, Options, Logs, Utils, Errors from waflib.Logs import debug from waflib.Configure import conf from waflib import ConfigSet @@ -1168,9 +1168,6 @@ def load_samba_deps(bld, tgt_list): def check_project_rules(bld): '''check the project rules - ensuring the targets are sane''' - if bld.__class__.__name__ == "ClangDbContext": - return - loops = {} inc_loops = {} @@ -1255,13 +1252,6 @@ def check_project_rules(bld): Logs.info("Project rules pass") - timer = Utils.Timer() - - bld.load('clang_compilation_database') - Scripting.run_command('clangdb') - - debug("deps: clang_compilation_database: %s" % str(timer)) - def CHECK_PROJECT_RULES(bld): '''enable checking of project targets for sanity''' diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 863e9d5ba22..45047e18ada 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -465,8 +465,7 @@ def RECURSE(ctx, directory): 'CleanContext', 'InstallContext', 'UninstallContext', - 'ListContext', - 'ClangDbContext']: + 'ListContext']: return ctx.recurse(relpath) if 'waflib.extras.compat15' in sys.modules: return ctx.recurse(relpath) diff --git a/wscript_build_embedded_heimdal b/wscript_build_embedded_heimdal index 18f1c46d16f..0536e21fef5 100644 --- a/wscript_build_embedded_heimdal +++ b/wscript_build_embedded_heimdal @@ -1,5 +1,4 @@ from waflib import Logs -if bld.__class__.__name__ != "ClangDbContext": - Logs.info("\tSelected embedded Heimdal build") +Logs.info("\tSelected embedded Heimdal build") bld.RECURSE('third_party/heimdal_build') diff --git a/wscript_build_system_heimdal b/wscript_build_system_heimdal index 42ff5959e00..1fc738ea69c 100644 --- a/wscript_build_system_heimdal +++ b/wscript_build_system_heimdal @@ -1,5 +1,4 @@ from waflib import Logs -if bld.__class__.__name__ != "ClangDbContext": - Logs.info("\tSelected system Heimdal build") +Logs.info("\tSelected system Heimdal build") bld.RECURSE('third_party/heimdal_build') diff --git a/wscript_build_system_mitkrb5 b/wscript_build_system_mitkrb5 index b522688e4e4..1fbf3efb9a3 100644 --- a/wscript_build_system_mitkrb5 +++ b/wscript_build_system_mitkrb5 @@ -1,4 +1,3 @@ from waflib import Logs -if bld.__class__.__name__ != "ClangDbContext": - Logs.info("\tSelected system MIT krb5 libraries, Heimdal use is disabled") +Logs.info("\tSelected system MIT krb5 libraries, Heimdal use is disabled") |