sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

wafsamba: Remove clangdb code which doesn't work

Browse Source 
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>
This commit is contained in:
Stefan Metzmacher 2022-01-21 17:05:57 +01:00
parent 82a21581c6
commit 85dbc023c3
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildtools/wafsamba/samba_deps.py
View File

@ -2,7 +2,7 @@
import os, sys, re 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.Logs import debug
from waflib.Configure import conf from waflib.Configure import conf
from waflib import ConfigSet from waflib import ConfigSet
@ -1168,9 +1168,6 @@ def load_samba_deps(bld, tgt_list):
def check_project_rules(bld): def check_project_rules(bld):
'''check the project rules - ensuring the targets are sane''' '''check the project rules - ensuring the targets are sane'''
if bld.__class__.__name__ == "ClangDbContext":
return
loops = {} loops = {}
inc_loops = {} inc_loops = {}
@ -1255,13 +1252,6 @@ def check_project_rules(bld):
Logs.info("Project rules pass") 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): def CHECK_PROJECT_RULES(bld):
'''enable checking of project targets for sanity''' '''enable checking of project targets for sanity'''

3
buildtools/wafsamba/samba_utils.py
View File

@ -465,8 +465,7 @@ def RECURSE(ctx, directory):
'CleanContext', 'CleanContext',
'InstallContext', 'InstallContext',
'UninstallContext', 'UninstallContext',
'ListContext', 'ListContext']:
'ClangDbContext']:
return ctx.recurse(relpath) return ctx.recurse(relpath)
if 'waflib.extras.compat15' in sys.modules: if 'waflib.extras.compat15' in sys.modules:
return ctx.recurse(relpath) return ctx.recurse(relpath)

1
wscript_build_embedded_heimdal
View File

@ -1,5 +1,4 @@
from waflib import Logs 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') bld.RECURSE('third_party/heimdal_build')

1
wscript_build_system_heimdal
View File

@ -1,5 +1,4 @@
from waflib import Logs 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') bld.RECURSE('third_party/heimdal_build')

1
wscript_build_system_mitkrb5
View File

@ -1,4 +1,3 @@
from waflib import Logs 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")