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 <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index 8073229bdd6fa920a506bd3984e67c2fc262184f..04460d0e65665724e8afb195038fb9f8ada37572 100644 (file)
--- 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 f2a2ba7fb5d32cbdb39f0d7ce3dcb62c2919bfb7..cc310fbf512983639d1ab82c0221380a022adf6f 100644 (file)
--- 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()