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

wafsamba: remove the need of BuildContext.bdir

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2018-11-15 11:41:07 +01:00 committed by Andrew Bartlett
parent c0104a4a04
commit 8e1135f99b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildtools/wafsamba/samba_deps.py
View File

@ -1011,14 +1011,14 @@ def save_samba_deps(bld, tgt_list):
if tdeps != {}:
denv.outenv[t.sname] = tdeps
depsfile = os.path.join(bld.bdir, "sambadeps")
depsfile = os.path.join(bld.cache_dir, "sambadeps")
denv.store_fast(depsfile)
def load_samba_deps(bld, tgt_list):
'''load a previous set of build dependencies if possible'''
depsfile = os.path.join(bld.bldnode.abspath(), "sambadeps")
depsfile = os.path.join(bld.cache_dir, "sambadeps")
denv = ConfigSet.ConfigSet()
try:
debug('deps: checking saved dependencies')

1
buildtools/wafsamba/samba_waf18.py
View File

@ -44,7 +44,6 @@ for y in (Build.BuildContext, Build.CleanContext, Build.InstallContext, Build.Un
def pre_build(self):
self.cwdx = self.bldnode.parent
self.cwd = self.cwdx.abspath()
self.bdir = self.bldnode.abspath()
return Build.BuildContext.old_pre_build(self)
Build.BuildContext.old_pre_build = Build.BuildContext.pre_build
Build.BuildContext.pre_build = pre_build