From ea578830ceebb0b4606dbde1359008d176819cd5 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 2 Feb 2018 16:34:31 +0200 Subject: [PATCH] lib/replace/wscript: update to handle waf 2.0.4 Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett --- lib/replace/wscript | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index 3dd10ae0356..fa9b837b75f 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -3,22 +3,24 @@ APPNAME = 'libreplace' VERSION = '1.2.1' -blddir = 'bin' - -import Logs, sys, os +import sys +import os # find the buildtools directory -srcdir = '.' -while not os.path.exists(srcdir+'/buildtools') and len(srcdir.split('/')) < 5: - srcdir = srcdir + '/..' -sys.path.insert(0, srcdir + '/buildtools/wafsamba') +top = '.' +while not os.path.exists(top+'/buildtools') and len(top.split('/')) < 5: + top = top + '/..' +sys.path.insert(0, top + '/buildtools/wafsamba') + +out = 'bin' -import wafsamba, samba_dist -import Options, Utils +import wafsamba +from wafsamba import samba_dist +from waflib import Options, Utils, Logs, Context samba_dist.DIST_DIRS('lib/replace buildtools:buildtools third_party/waf:third_party/waf') -def set_options(opt): +def options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') -- 2.11.4.GIT