Skip to content

Commit 85dbc02

Browse files
committed
wafsamba: Remove clangdb code which doesn't work
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]>
1 parent 82a2158 commit 85dbc02

File tree

5 files changed

+5
-19
lines changed

5 files changed

+5
-19
lines changed

buildtools/wafsamba/samba_deps.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os, sys, re
44

5-
from waflib import Build, Options, Logs, Utils, Errors, Scripting
5+
from waflib import Build, Options, Logs, Utils, Errors
66
from waflib.Logs import debug
77
from waflib.Configure import conf
88
from waflib import ConfigSet
@@ -1168,9 +1168,6 @@ def load_samba_deps(bld, tgt_list):
11681168
def check_project_rules(bld):
11691169
'''check the project rules - ensuring the targets are sane'''
11701170

1171-
if bld.__class__.__name__ == "ClangDbContext":
1172-
return
1173-
11741171
loops = {}
11751172
inc_loops = {}
11761173

@@ -1255,13 +1252,6 @@ def check_project_rules(bld):
12551252

12561253
Logs.info("Project rules pass")
12571254

1258-
timer = Utils.Timer()
1259-
1260-
bld.load('clang_compilation_database')
1261-
Scripting.run_command('clangdb')
1262-
1263-
debug("deps: clang_compilation_database: %s" % str(timer))
1264-
12651255

12661256
def CHECK_PROJECT_RULES(bld):
12671257
'''enable checking of project targets for sanity'''

buildtools/wafsamba/samba_utils.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,7 @@ def RECURSE(ctx, directory):
465465
'CleanContext',
466466
'InstallContext',
467467
'UninstallContext',
468-
'ListContext',
469-
'ClangDbContext']:
468+
'ListContext']:
470469
return ctx.recurse(relpath)
471470
if 'waflib.extras.compat15' in sys.modules:
472471
return ctx.recurse(relpath)

wscript_build_embedded_heimdal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from waflib import Logs
22

3-
if bld.__class__.__name__ != "ClangDbContext":
4-
Logs.info("\tSelected embedded Heimdal build")
3+
Logs.info("\tSelected embedded Heimdal build")
54
bld.RECURSE('third_party/heimdal_build')

wscript_build_system_heimdal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from waflib import Logs
22

3-
if bld.__class__.__name__ != "ClangDbContext":
4-
Logs.info("\tSelected system Heimdal build")
3+
Logs.info("\tSelected system Heimdal build")
54
bld.RECURSE('third_party/heimdal_build')

wscript_build_system_mitkrb5

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
from waflib import Logs
22

3-
if bld.__class__.__name__ != "ClangDbContext":
4-
Logs.info("\tSelected system MIT krb5 libraries, Heimdal use is disabled")
3+
Logs.info("\tSelected system MIT krb5 libraries, Heimdal use is disabled")

0 commit comments

Comments
 (0)