Skip to content

Commit

Permalink
wafsamba: Remove clangdb code which doesn't work
Browse files Browse the repository at this point in the history
This generates an incomplete database where defines and includes are missing.

Pair-Programmed-With: Andreas Schneider <[email protected]>
Signed-off-by: Andreas Schneider <[email protected]>
Signed-off-by: Stefan Metzmacher <[email protected]>
  • Loading branch information
metze-samba committed Jan 21, 2022
1 parent 82a2158 commit 85dbc02
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 19 deletions.
12 changes: 1 addition & 11 deletions buildtools/wafsamba/samba_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {}

Expand Down Expand Up @@ -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'''
Expand Down
3 changes: 1 addition & 2 deletions buildtools/wafsamba/samba_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions wscript_build_embedded_heimdal
Original file line number Diff line number Diff line change
@@ -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')
3 changes: 1 addition & 2 deletions wscript_build_system_heimdal
Original file line number Diff line number Diff line change
@@ -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')
3 changes: 1 addition & 2 deletions wscript_build_system_mitkrb5
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 85dbc02

Please sign in to comment.