From 6c48f08e97f3152e33ce58a92bb734047744e3b0 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 20 Nov 2016 13:47:31 +0100 Subject: [PATCH] Simplify waflib/extras/force_build_directory.py --- waflib/extras/force_build_directory.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/waflib/extras/force_build_directory.py b/waflib/extras/force_build_directory.py index 6bf6653e..8fce0360 100644 --- a/waflib/extras/force_build_directory.py +++ b/waflib/extras/force_build_directory.py @@ -11,18 +11,13 @@ Force all build files to go to the build directory: """ import os -from waflib import Node, Utils +from waflib import Node def find_or_declare(self, lst): - if isinstance(lst, str): - lst = [x for x in Utils.split_path(lst) if x and x != '.'] - - node = self.get_bld().search_node(lst) - if node: - if not os.path.isfile(node.abspath()): - node.parent.mkdir() - return node - node = self.get_bld().make_node(lst) + if isinstance(lst, str) and os.path.isabs(lst): + node = self.ctx.root.make_node(lst) + else: + node = self.get_bld().make_node(lst) node.parent.mkdir() return node Node.Node.find_or_declare = find_or_declare