From 076afab4cfe06e4215649c9368293d855b26c9af Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 13 Nov 2018 17:04:39 +0100 Subject: [PATCH] wafsamba: remove unused Build.BuildContext.pre_build overload This is not needed and also fixed the interaction between vim and ':make' Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_pidl.py | 2 +- buildtools/wafsamba/samba_waf18.py | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index 8073229bdd6..04460d0e656 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -89,7 +89,7 @@ def SAMBA_PIDL(bld, pname, source, # prime the list of nodes we are dependent on with the cached pidl sources t.allnodes = pidl_src_nodes - t.env.PIDL_LAUNCH_DIR = bld.srcnode.path_from(bld.bldnode.parent) + t.env.PIDL_LAUNCH_DIR = bld.srcnode.path_from(bld.bldnode) pnode = bld.srcnode.find_resource('pidl/pidl') t.env.PIDL = pnode.path_from(bld.srcnode) t.env.OPTIONS = TO_LIST(options) diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py index f2a2ba7fb5d..cc310fbf512 100644 --- a/buildtools/wafsamba/samba_waf18.py +++ b/buildtools/wafsamba/samba_waf18.py @@ -41,13 +41,6 @@ for y in (Build.BuildContext, Build.CleanContext, Build.InstallContext, Build.Un class tmp(y): variant = 'default' -def pre_build(self): - self.cwdx = self.bldnode.parent - self.cwd = self.cwdx.abspath() - return Build.BuildContext.old_pre_build(self) -Build.BuildContext.old_pre_build = Build.BuildContext.pre_build -Build.BuildContext.pre_build = pre_build - def abspath(self, env=None): if env and hasattr(self, 'children'): return self.get_bld().abspath() -- 2.11.4.GIT