Move waf into third_party/.

Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

84 files changed, 16 insertions, 89 deletions

diff --git a/buildtools/bin/waf b/buildtools/bin/waf
index db6a7d3386a..1b0f4662a56 100755
--- a/buildtools/bin/waf
+++ b/buildtools/bin/waf
@@ -63,7 +63,7 @@ def test(dir):
 	except OSError: pass
 
 def find_lib():
-	return os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+	return os.path.abspath(os.path.join(os.path.dirname(__file__), '../../third_party/waf'))
 
 wafdir = find_lib()
 w = join(wafdir, 'wafadmin')
diff --git a/ctdb/wscript b/ctdb/wscript
index f0b68cdcc18..cd0226225fb 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -34,7 +34,7 @@ samba_dist.DIST_DIRS('''ctdb:. lib/replace:lib/replace lib/talloc:lib/talloc
                         third_party/popt:third_party/popt
                         lib/util:lib/util lib/tdb_wrap:lib/tdb_wrap
                         lib/ccan:lib/ccan libcli/util:libcli/util
-                        buildtools:buildtools''')
+                        buildtools:buildtools third_party/waf:third_party/waf''')
 
 
 def set_options(opt):
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 886b3e7518c..65a684307d4 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -18,7 +18,7 @@ import wafsamba, samba_dist, Options, Utils
 samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc
                         lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent
                         third_party/popt:third_party/popt
-                        buildtools:buildtools''')
+                        buildtools:buildtools third_party/waf:third_party/waf''')
 
 
 def set_options(opt):
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 19494484696..8a203c778d4 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -16,7 +16,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 import wafsamba, samba_dist
 import Options
 
-samba_dist.DIST_DIRS('lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS('lib/replace buildtools:buildtools third_party/waf:third_party/waf')
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('NONE')
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 9efc895b558..a1b72a07613 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -20,7 +20,8 @@ sys.path.insert(0, srcdir+"/buildtools/wafsamba")
 import wafsamba, samba_dist, Options
 
 # setup what directories to put in a tarball
-samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS("""lib/talloc:. lib/replace:lib/replace
+buildtools:buildtools third_party/waf:third_party/waf""")
 
 
 def set_options(opt):
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index b283795870b..fdc5d2fd37c 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -15,7 +15,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import wafsamba, samba_dist, Options, Logs
 
-samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
+samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools third_party/waf:third_party/waf')
 
 tdb1_unit_tests = [
     'run-3G-file',
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 0da82326bcc..026cd9a1c1b 100755
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -15,7 +15,7 @@ sys.path.insert(0, srcdir + '/buildtools/wafsamba')
 
 import wafsamba, samba_dist, Options, Logs
 
-samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools')
+samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc buildtools:buildtools third_party/waf:third_party/waf')
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
diff --git a/selftest/tests.py b/selftest/tests.py
index cceb6e4f471..1185142afc5 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -65,7 +65,7 @@ planpythontestsuite("none", "samba.tests.samba3sam")
 planpythontestsuite(
     "none", "wafsamba.tests.test_suite",
     extra_path=[os.path.join(samba4srcdir, "..", "buildtools"),
-                os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
+                os.path.join(samba4srcdir, "..", "third_party", "waf", "wafadmin")])
 plantestsuite(
     "samba4.blackbox.dbcheck.alpha13", "none",
     ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"),
diff --git a/buildtools/wafadmin/3rdparty/ParallelDebug.py b/third_party/waf/wafadmin/3rdparty/ParallelDebug.py
index 9d0493e5e17..0ff580ece27 100644
--- a/buildtools/wafadmin/3rdparty/ParallelDebug.py
+++ b/third_party/waf/wafadmin/3rdparty/ParallelDebug.py
@@ -295,5 +295,3 @@ function hideInfo(evt) {
 	#node = producer.bld.path.make_node('pdebug.svg')
 	f = open('pdebug.svg', 'w')
 	f.write("".join(out))
-
-
diff --git a/buildtools/wafadmin/3rdparty/batched_cc.py b/third_party/waf/wafadmin/3rdparty/batched_cc.py
index 8e310745c63..7ed569ccb70 100644
--- a/buildtools/wafadmin/3rdparty/batched_cc.py
+++ b/third_party/waf/wafadmin/3rdparty/batched_cc.py
@@ -180,4 +180,3 @@ for c in ['cc', 'cxx']:
 	setattr(t, 'post_run', post_run)
 	setattr(t, 'old_can_retrieve_cache', t.can_retrieve_cache)
 	setattr(t, 'can_retrieve_cache', can_retrieve_cache)
-
diff --git a/buildtools/wafadmin/3rdparty/boost.py b/third_party/waf/wafadmin/3rdparty/boost.py
index e690a4e2740..1cbbf7e850d 100644
--- a/buildtools/wafadmin/3rdparty/boost.py
+++ b/third_party/waf/wafadmin/3rdparty/boost.py
@@ -340,4 +340,3 @@ def check_boost(self, *k, **kw):
 				self.check_message_2(kw['okmsg'])
 
 	return ret
-
diff --git a/buildtools/wafadmin/3rdparty/build_file_tracker.py b/third_party/waf/wafadmin/3rdparty/build_file_tracker.py
index 9c48928fc02..5fc73581ec2 100644
--- a/buildtools/wafadmin/3rdparty/build_file_tracker.py
+++ b/third_party/waf/wafadmin/3rdparty/build_file_tracker.py
@@ -51,4 +51,3 @@ def signature(self):
 
 Task.Task.signature_bak = Task.Task.signature # unused, kept just in case
 Task.Task.signature = signature # overridden
-
diff --git a/buildtools/wafadmin/3rdparty/fluid.py b/third_party/waf/wafadmin/3rdparty/fluid.py
index 117edef7200..c858fe311cb 100644
--- a/buildtools/wafadmin/3rdparty/fluid.py
+++ b/third_party/waf/wafadmin/3rdparty/fluid.py
@@ -24,4 +24,3 @@ def fluid(self, node):
 def detect(conf):
     fluid = conf.find_program('fluid', var='FLUID', mandatory=True)
     conf.check_cfg(path='fltk-config', package='', args='--cxxflags --ldflags', uselib_store='FLTK', mandatory=True)
-
diff --git a/buildtools/wafadmin/3rdparty/gccdeps.py b/third_party/waf/wafadmin/3rdparty/gccdeps.py
index 6600c9ca3ba..28a889d78b6 100644
--- a/buildtools/wafadmin/3rdparty/gccdeps.py
+++ b/third_party/waf/wafadmin/3rdparty/gccdeps.py
@@ -125,4 +125,3 @@ for name in 'cc cxx'.split():
 		cls.post_run = post_run
 		cls.scan = scan
 		cls.sig_implicit_deps = sig_implicit_deps
-
diff --git a/buildtools/wafadmin/3rdparty/go.py b/third_party/waf/wafadmin/3rdparty/go.py
index 2d8df0d2b64..f8397c7e1c7 100644
--- a/buildtools/wafadmin/3rdparty/go.py
+++ b/third_party/waf/wafadmin/3rdparty/go.py
@@ -108,4 +108,3 @@ def apply_golink(self):
 			self.path.find_or_declare(self.target))
 	self.go_link_task.set_run_after(self.go_compile_task)
 	self.go_link_task.dep_nodes.extend(self.go_compile_task.outputs)
-
diff --git a/buildtools/wafadmin/3rdparty/lru_cache.py b/third_party/waf/wafadmin/3rdparty/lru_cache.py
index 5b00abc29be..96f0e6cf109 100644
--- a/buildtools/wafadmin/3rdparty/lru_cache.py
+++ b/third_party/waf/wafadmin/3rdparty/lru_cache.py
@@ -94,4 +94,3 @@ def sweep(self):
 Build.BuildContext.raw_compile = Build.BuildContext.compile
 Build.BuildContext.compile = compile
 Build.BuildContext.sweep = sweep
-
diff --git a/buildtools/wafadmin/3rdparty/paranoid.py b/third_party/waf/wafadmin/3rdparty/paranoid.py
index ead64ea5c3a..ba6d7528949 100644
--- a/buildtools/wafadmin/3rdparty/paranoid.py
+++ b/third_party/waf/wafadmin/3rdparty/paranoid.py
@@ -32,4 +32,3 @@ def compile(self):
 		check_task_classes(self)
 	return comp(self)
 Build.BuildContext.compile = compile
-
diff --git a/buildtools/wafadmin/3rdparty/prefork.py b/third_party/waf/wafadmin/3rdparty/prefork.py
index 1c760c27bba..88fb4e40619 100755
--- a/buildtools/wafadmin/3rdparty/prefork.py
+++ b/third_party/waf/wafadmin/3rdparty/prefork.py
@@ -273,4 +273,3 @@ else:
 	def build(bld):
 		# dangerous, there is no other command hopefully
 		Utils.exec_command = exec_command
-
diff --git a/buildtools/wafadmin/3rdparty/swig.py b/third_party/waf/wafadmin/3rdparty/swig.py
index c0a4108700e..393e8e190a0 100644
--- a/buildtools/wafadmin/3rdparty/swig.py
+++ b/third_party/waf/wafadmin/3rdparty/swig.py
@@ -187,4 +187,3 @@ def check_swig_version(conf, minver=None):
 
 def detect(conf):
 	swig = conf.find_program('swig', var='SWIG', mandatory=True)
-
diff --git a/buildtools/wafadmin/3rdparty/valadoc.py b/third_party/waf/wafadmin/3rdparty/valadoc.py
index d0a9fe80ed6..bdb0c6bd5b8 100644
--- a/buildtools/wafadmin/3rdparty/valadoc.py
+++ b/third_party/waf/wafadmin/3rdparty/valadoc.py
@@ -110,4 +110,3 @@ def process_valadoc(self):
 
 def detect(conf):
   conf.find_program('valadoc', var='VALADOC', mandatory=False)
-
diff --git a/buildtools/wafadmin/Build.py b/third_party/waf/wafadmin/Build.py
index 8e7c72c4ed7..50f4d7f6c69 100644
--- a/buildtools/wafadmin/Build.py
+++ b/third_party/waf/wafadmin/Build.py
@@ -1030,4 +1030,3 @@ class BuildContext(Utils.Context):
 	install_as = group_method(install_as)
 	install_files = group_method(install_files)
 	symlink_as = group_method(symlink_as)
-
diff --git a/buildtools/wafadmin/Configure.py b/third_party/waf/wafadmin/Configure.py
index 35b4e51ec35..7575cefd0e1 100644
--- a/buildtools/wafadmin/Configure.py
+++ b/third_party/waf/wafadmin/Configure.py
@@ -440,5 +440,3 @@ def conftest(f):
 	"decorator: attach new configuration tests (registered as strings)"
 	ConfigurationContext.tests[f.__name__] = f
 	return conf(f)
-
-
diff --git a/buildtools/wafadmin/Constants.py b/third_party/waf/wafadmin/Constants.py
index e67dda6ecd8..30960b978d1 100644
--- a/buildtools/wafadmin/Constants.py
+++ b/third_party/waf/wafadmin/Constants.py
@@ -73,4 +73,3 @@ CFG_FILES = 'cfg_files'
 # negative '<-' uninstall
 INSTALL = 1337
 UNINSTALL = -1337
-
diff --git a/buildtools/wafadmin/Environment.py b/third_party/waf/wafadmin/Environment.py
index 52c83b4f3e4..bea41465165 100644
--- a/buildtools/wafadmin/Environment.py
+++ b/third_party/waf/wafadmin/Environment.py
@@ -207,4 +207,3 @@ class Environment(object):
 			object.__delattr__(self, name)
 		else:
 			del self[name]
-
diff --git a/buildtools/wafadmin/Logs.py b/third_party/waf/wafadmin/Logs.py
index c160b377366..f67e87c7212 100644
--- a/buildtools/wafadmin/Logs.py
+++ b/third_party/waf/wafadmin/Logs.py
@@ -131,4 +131,3 @@ def init_log():
 
 # may be initialized more than once
 init_log()
-
diff --git a/buildtools/wafadmin/Node.py b/third_party/waf/wafadmin/Node.py
index 4fa205c96be..158a4a4d470 100644
--- a/buildtools/wafadmin/Node.py
+++ b/third_party/waf/wafadmin/Node.py
@@ -692,4 +692,3 @@ class Node(object):
 
 class Nodu(Node):
 	pass
-
diff --git a/buildtools/wafadmin/Options.py b/third_party/waf/wafadmin/Options.py
index c9ddcfe6503..7e87c110902 100644
--- a/buildtools/wafadmin/Options.py
+++ b/third_party/waf/wafadmin/Options.py
@@ -285,4 +285,3 @@ class Handler(Utils.Context):
 
 	def parse_args(self, args=None):
 		parse_args_impl(self.parser, args)
-
diff --git a/buildtools/wafadmin/Runner.py b/third_party/waf/wafadmin/Runner.py
index 94db0fbd1ba..0d2dea5ef47 100644
--- a/buildtools/wafadmin/Runner.py
+++ b/third_party/waf/wafadmin/Runner.py
@@ -233,4 +233,3 @@ class Parallel(object):
 
 		#print loop
 		assert (self.count == 0 or self.stop)
-
diff --git a/buildtools/wafadmin/Scripting.py b/third_party/waf/wafadmin/Scripting.py
index d975bd934d1..6f6110487db 100644
--- a/buildtools/wafadmin/Scripting.py
+++ b/third_party/waf/wafadmin/Scripting.py
@@ -583,4 +583,3 @@ def distcheck(appname='', version='', subdir=''):
 # FIXME remove in Waf 1.6 (kept for compatibility)
 def add_subdir(dir, bld):
 	bld.recurse(dir, 'build')
-
diff --git a/buildtools/wafadmin/Task.py b/third_party/waf/wafadmin/Task.py
index 5cda2ec7301..59d10203a49 100644
--- a/buildtools/wafadmin/Task.py
+++ b/third_party/waf/wafadmin/Task.py
@@ -1197,4 +1197,3 @@ def extract_deps(tasks):
 			delattr(x, 'cache_sig')
 		except AttributeError:
 			pass
-
diff --git a/buildtools/wafadmin/TaskGen.py b/third_party/waf/wafadmin/TaskGen.py
index 52d0236c850..5900809ddfe 100644
--- a/buildtools/wafadmin/TaskGen.py
+++ b/third_party/waf/wafadmin/TaskGen.py
@@ -291,8 +291,8 @@ class task_gen(object):
 		else: self.source += lst
 
 	def clone(self, env):
-		"""when creating a clone in a task generator method, 
-		make sure to set posted=False on the clone 
+		"""when creating a clone in a task generator method,
+		make sure to set posted=False on the clone
 		else the other task generator will not create its tasks"""
 		newobj = task_gen(bld=self.bld)
 		for x in self.__dict__:
@@ -609,4 +609,3 @@ def sequence_order(self):
 	self.bld.prev = self
 
 feature('seq')(sequence_order)
-
diff --git a/buildtools/wafadmin/Tools/__init__.py b/third_party/waf/wafadmin/Tools/__init__.py
index bc6ca230b5e..8f026e187ff 100644
--- a/buildtools/wafadmin/Tools/__init__.py
+++ b/third_party/waf/wafadmin/Tools/__init__.py
@@ -1,4 +1,3 @@
 #!/usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2006 (ita)
-
diff --git a/buildtools/wafadmin/Tools/ar.py b/third_party/waf/wafadmin/Tools/ar.py
index af9b17fd6e9..3571670d5b5 100644
--- a/buildtools/wafadmin/Tools/ar.py
+++ b/third_party/waf/wafadmin/Tools/ar.py
@@ -32,5 +32,3 @@ def find_ar(conf):
 	v = conf.env
 	conf.check_tool('ar')
 	if not v['AR']: conf.fatal('ar is required for static libraries - not found')
-
-
diff --git a/buildtools/wafadmin/Tools/bison.py b/third_party/waf/wafadmin/Tools/bison.py
index 49c60518733..c281e61ddaf 100644
--- a/buildtools/wafadmin/Tools/bison.py
+++ b/third_party/waf/wafadmin/Tools/bison.py
@@ -35,4 +35,3 @@ def big_bison(self, node):
 def detect(conf):
 	bison = conf.find_program('bison', var='BISON', mandatory=True)
 	conf.env['BISONFLAGS'] = '-d'
-
diff --git a/buildtools/wafadmin/Tools/cc.py b/third_party/waf/wafadmin/Tools/cc.py
index 903a1c5038c..e54df4715e5 100644
--- a/buildtools/wafadmin/Tools/cc.py
+++ b/third_party/waf/wafadmin/Tools/cc.py
@@ -97,4 +97,3 @@ link_str = '${LINK_CC} ${CCLNK_SRC_F}${SRC} ${CCLNK_TGT_F}${TGT[0].abspath(env)}
 cls = Task.simple_task_type('cc_link', link_str, color='YELLOW', ext_in='.o', ext_out='.bin', shell=False)
 cls.maxjobs = 1
 cls.install = Utils.nada
-
diff --git a/buildtools/wafadmin/Tools/ccroot.py b/third_party/waf/wafadmin/Tools/ccroot.py
index 25c5179be0e..c130b40a21d 100644
--- a/buildtools/wafadmin/Tools/ccroot.py
+++ b/third_party/waf/wafadmin/Tools/ccroot.py
@@ -637,4 +637,3 @@ cls.quiet = 1
 def add_as_needed(conf):
 	if conf.env.DEST_BINFMT == 'elf' and 'gcc' in (conf.env.CXX_NAME, conf.env.CC_NAME):
 		conf.env.append_unique('LINKFLAGS', '--as-needed')
-
diff --git a/buildtools/wafadmin/Tools/compiler_cc.py b/third_party/waf/wafadmin/Tools/compiler_cc.py
index 0421503f7c9..642458aba61 100644
--- a/buildtools/wafadmin/Tools/compiler_cc.py
+++ b/third_party/waf/wafadmin/Tools/compiler_cc.py
@@ -64,4 +64,3 @@ def set_options(opt):
 
 	for c_compiler in test_for_compiler.split():
 		opt.tool_options('%s' % c_compiler, option_group=cc_compiler_opts)
-
diff --git a/buildtools/wafadmin/Tools/compiler_cxx.py b/third_party/waf/wafadmin/Tools/compiler_cxx.py
index 5308ea97199..aa0b0e7d460 100644
--- a/buildtools/wafadmin/Tools/compiler_cxx.py
+++ b/third_party/waf/wafadmin/Tools/compiler_cxx.py
@@ -59,4 +59,3 @@ def set_options(opt):
 
 	for cxx_compiler in test_for_compiler.split():
 		opt.tool_options('%s' % cxx_compiler, option_group=cxx_compiler_opts)
-
diff --git a/buildtools/wafadmin/Tools/compiler_d.py b/third_party/waf/wafadmin/Tools/compiler_d.py
index 1ea5efa30e8..378277a25aa 100644
--- a/buildtools/wafadmin/Tools/compiler_d.py
+++ b/third_party/waf/wafadmin/Tools/compiler_d.py
@@ -30,4 +30,3 @@ def set_options(opt):
 
 	for d_compiler in ['gdc', 'dmd']:
 		opt.tool_options('%s' % d_compiler, option_group=d_compiler_opts)
-
diff --git a/buildtools/wafadmin/Tools/config_c.py b/third_party/waf/wafadmin/Tools/config_c.py
index d0bc6177362..9f1103cb27d 100644
--- a/buildtools/wafadmin/Tools/config_c.py
+++ b/third_party/waf/wafadmin/Tools/config_c.py
@@ -746,4 +746,3 @@ def cc_load_tools(conf):
 @conftest
 def cxx_load_tools(conf):
 	conf.check_tool('cxx')
-
diff --git a/buildtools/wafadmin/Tools/cs.py b/third_party/waf/wafadmin/Tools/cs.py
index 43544856f34..4c987d2a875 100644
--- a/buildtools/wafadmin/Tools/cs.py
+++ b/third_party/waf/wafadmin/Tools/cs.py
@@ -65,4 +65,3 @@ def detect(conf):
 
 def set_options(opt):
 	opt.add_option('--with-csc-binary', type='string', dest='cscbinary')
-
diff --git a/buildtools/wafadmin/Tools/cxx.py b/third_party/waf/wafadmin/Tools/cxx.py
index 719b82177c1..184fee3e065 100644
--- a/buildtools/wafadmin/Tools/cxx.py
+++ b/third_party/waf/wafadmin/Tools/cxx.py
@@ -101,4 +101,3 @@ link_str = '${LINK_CXX} ${CXXLNK_SRC_F}${SRC} ${CXXLNK_TGT_F}${TGT[0].abspath(en
 cls = Task.simple_task_type('cxx_link', link_str, color='YELLOW', ext_in='.o', ext_out='.bin', shell=False)
 cls.maxjobs = 1
 cls.install = Utils.nada
-
diff --git a/buildtools/wafadmin/Tools/d.py b/third_party/waf/wafadmin/Tools/d.py
index 1a22821bc55..2c2e94857e3 100644
--- a/buildtools/wafadmin/Tools/d.py
+++ b/third_party/waf/wafadmin/Tools/d.py
@@ -532,4 +532,3 @@ if __name__ == "__main__":
 		print imp + " ",
 	print
 """
-
diff --git a/buildtools/wafadmin/Tools/dbus.py b/third_party/waf/wafadmin/Tools/dbus.py
index 31799993921..42c4ca2cb7f 100644
--- a/buildtools/wafadmin/Tools/dbus.py
+++ b/third_party/waf/wafadmin/Tools/dbus.py
@@ -31,4 +31,3 @@ Task.simple_task_type('dbus_binding_tool',
 
 def detect(conf):
 	dbus_binding_tool = conf.find_program('dbus-binding-tool', var='DBUS_BINDING_TOOL')
-
diff --git a/buildtools/wafadmin/Tools/dmd.py b/third_party/waf/wafadmin/Tools/dmd.py
index 9c7490844db..b86ffd6a0f4 100644
--- a/buildtools/wafadmin/Tools/dmd.py
+++ b/third_party/waf/wafadmin/Tools/dmd.py
@@ -61,4 +61,3 @@ def detect(conf):
 
 	if conf.env.D_COMPILER.find('ldc') > -1:
 		conf.common_flags_ldc()
-
diff --git a/buildtools/wafadmin/Tools/flex.py b/third_party/waf/wafadmin/Tools/flex.py
index 5ce9f2210e3..cbea42db2c9 100644
--- a/buildtools/wafadmin/Tools/flex.py
+++ b/third_party/waf/wafadmin/Tools/flex.py
@@ -22,4 +22,3 @@ TaskGen.declare_chain(
 def detect(conf):
 	conf.find_program('flex', var='FLEX', mandatory=True)
 	conf.env['FLEXFLAGS'] = ''
-
diff --git a/buildtools/wafadmin/Tools/gas.py b/third_party/waf/wafadmin/Tools/gas.py
index c983b0a3959..5dd0b5d7460 100644
--- a/buildtools/wafadmin/Tools/gas.py
+++ b/third_party/waf/wafadmin/Tools/gas.py
@@ -35,4 +35,3 @@ def detect(conf):
 	conf.find_program(['gas', 'as'], var='AS')
 	if not conf.env.AS: conf.env.AS = conf.env.CC
 	#conf.env.ASFLAGS = ['-c'] <- may be necesary for .S files
-
diff --git a/buildtools/wafadmin/Tools/gcc.py b/third_party/waf/wafadmin/Tools/gcc.py
index a6be0b28dbf..83d5b248ad9 100644
--- a/buildtools/wafadmin/Tools/gcc.py
+++ b/third_party/waf/wafadmin/Tools/gcc.py
@@ -136,4 +136,3 @@ def detect(conf):
 	conf.cc_load_tools()
 	conf.cc_add_flags()
 	conf.link_add_flags()
-
diff --git a/buildtools/wafadmin/Tools/gdc.py b/third_party/waf/wafadmin/Tools/gdc.py
index 4d2a3216edd..d1e5e7b53cb 100644
--- a/buildtools/wafadmin/Tools/gdc.py
+++ b/third_party/waf/wafadmin/Tools/gdc.py
@@ -49,4 +49,3 @@ def detect(conf):
 	conf.check_tool('d')
 	conf.common_flags_gdc()
 	conf.d_platform_flags()
-
diff --git a/buildtools/wafadmin/Tools/glib2.py b/third_party/waf/wafadmin/Tools/glib2.py
index 042d612cbe4..d3fc7769740 100644
--- a/buildtools/wafadmin/Tools/glib2.py
+++ b/third_party/waf/wafadmin/Tools/glib2.py
@@ -161,4 +161,3 @@ Task.simple_task_type('glib_mkenums',
 def detect(conf):
 	glib_genmarshal = conf.find_program('glib-genmarshal', var='GLIB_GENMARSHAL')
 	mk_enums_tool = conf.find_program('glib-mkenums', var='GLIB_MKENUMS')
-
diff --git a/buildtools/wafadmin/Tools/gnome.py b/third_party/waf/wafadmin/Tools/gnome.py
index c098a41bb4b..da11e91d3d8 100644
--- a/buildtools/wafadmin/Tools/gnome.py
+++ b/third_party/waf/wafadmin/Tools/gnome.py
@@ -220,4 +220,3 @@ def detect(conf):
 
 def set_options(opt):
 	opt.add_option('--want-rpath', type='int', default=1, dest='want_rpath', help='set rpath to 1 or 0 [Default 1]')
-
diff --git a/buildtools/wafadmin/Tools/gnu_dirs.py b/third_party/waf/wafadmin/Tools/gnu_dirs.py
index 856e4a7204b..ac149dfa46b 100644
--- a/buildtools/wafadmin/Tools/gnu_dirs.py
+++ b/third_party/waf/wafadmin/Tools/gnu_dirs.py
@@ -108,4 +108,3 @@ def set_options(opt):
 		str_default = default
 		str_help = '%s [Default: %s]' % (help, str_default)
 		dirs_options.add_option(option_name, help=str_help, default='', dest=name.upper())
-
diff --git a/buildtools/wafadmin/Tools/gob2.py b/third_party/waf/wafadmin/Tools/gob2.py
index 00aaa32acda..96d8e2030ca 100644
--- a/buildtools/wafadmin/Tools/gob2.py
+++ b/third_party/waf/wafadmin/Tools/gob2.py
@@ -15,4 +15,3 @@ def detect(conf):
 	gob2 = conf.find_program('gob2', var='GOB2', mandatory=True)
 	conf.env['GOB2'] = gob2
 	conf.env['GOB2FLAGS'] = ''
-
diff --git a/buildtools/wafadmin/Tools/gxx.py b/third_party/waf/wafadmin/Tools/gxx.py
index 4984122e5e6..38e8d00ae5b 100644
--- a/buildtools/wafadmin/Tools/gxx.py
+++ b/third_party/waf/wafadmin/Tools/gxx.py
@@ -100,7 +100,7 @@ def gxx_modifier_darwin(conf):
 
 	v['SHLIB_MARKER']        = ''
 	v['STATICLIB_MARKER']    = ''
-	v['SONAME_ST']		 = ''	
+	v['SONAME_ST']		 = ''
 
 @conftest
 def gxx_modifier_aix(conf):
@@ -134,4 +134,3 @@ def detect(conf):
 	conf.cxx_load_tools()
 	conf.cxx_add_flags()
 	conf.link_add_flags()
-
diff --git a/buildtools/wafadmin/Tools/icc.py b/third_party/waf/wafadmin/Tools/icc.py
index 9c9a92602c7..9c9a92602c7 100644
--- a/buildtools/wafadmin/Tools/icc.py
+++ b/third_party/waf/wafadmin/Tools/icc.py
diff --git a/buildtools/wafadmin/Tools/icpc.py b/third_party/waf/wafadmin/Tools/icpc.py
index 7d79c57e309..7d79c57e309 100644
--- a/buildtools/wafadmin/Tools/icpc.py
+++ b/third_party/waf/wafadmin/Tools/icpc.py
diff --git a/buildtools/wafadmin/Tools/intltool.py b/third_party/waf/wafadmin/Tools/intltool.py
index deb8f4a6341..5fb3df2cbbb 100644
--- a/buildtools/wafadmin/Tools/intltool.py
+++ b/third_party/waf/wafadmin/Tools/intltool.py
@@ -136,4 +136,3 @@ def detect(conf):
 def set_options(opt):
 	opt.add_option('--want-rpath', type='int', default=1, dest='want_rpath', help='set rpath to 1 or 0 [Default 1]')
 	opt.add_option('--datadir', type='string', default='', dest='datadir', help='read-only application data')
-
diff --git a/buildtools/wafadmin/Tools/javaw.py b/third_party/waf/wafadmin/Tools/javaw.py
index 301ebc426b9..4d9f4c77907 100644
--- a/buildtools/wafadmin/Tools/javaw.py
+++ b/third_party/waf/wafadmin/Tools/javaw.py
@@ -252,4 +252,3 @@ def check_jni_headers(conf):
 			break
 	else:
 		conf.fatal('could not find lib jvm in %r (see config.log)' % libDirs)
-
diff --git a/buildtools/wafadmin/Tools/kde4.py b/third_party/waf/wafadmin/Tools/kde4.py
index f480929da65..1f3bae783d3 100644
--- a/buildtools/wafadmin/Tools/kde4.py
+++ b/third_party/waf/wafadmin/Tools/kde4.py
@@ -71,4 +71,3 @@ def detect(conf):
 	conf.env['MSGFMT'] = conf.find_program('msgfmt')
 
 Task.simple_task_type('msgfmt', '${MSGFMT} ${SRC} -o ${TGT}', color='BLUE', shell=False)
-
diff --git a/buildtools/wafadmin/Tools/libtool.py b/third_party/waf/wafadmin/Tools/libtool.py
index 47fa906fccc..bcc0e2f318d 100644
--- a/buildtools/wafadmin/Tools/libtool.py
+++ b/third_party/waf/wafadmin/Tools/libtool.py
@@ -327,4 +327,3 @@ nor: %prog --libs /usr/lib/libamarok.la'''
 
 if __name__ == '__main__':
 	useCmdLine()
-
diff --git a/buildtools/wafadmin/Tools/lua.py b/third_party/waf/wafadmin/Tools/lua.py
index 5b181e1310f..8a6c1f46e79 100644
--- a/buildtools/wafadmin/Tools/lua.py
+++ b/third_party/waf/wafadmin/Tools/lua.py
@@ -22,4 +22,3 @@ def init_lua(self):
 
 def detect(conf):
 	conf.find_program('luac', var='LUAC', mandatory = True)
-
diff --git a/buildtools/wafadmin/Tools/misc.py b/third_party/waf/wafadmin/Tools/misc.py
index 9903ee4bd3c..6ef45aef444 100644
--- a/buildtools/wafadmin/Tools/misc.py
+++ b/third_party/waf/wafadmin/Tools/misc.py
@@ -427,4 +427,3 @@ def runnable_status(self):
 
 Task.task_type_from_func('copy', vars=[], func=action_process_file_func)
 TaskGen.task_gen.classes['command-output'] = cmd_output_taskgen
-
diff --git a/buildtools/wafadmin/Tools/msvc.py b/third_party/waf/wafadmin/Tools/msvc.py
index 4fde8b14687..2a97d19a7eb 100644
--- a/buildtools/wafadmin/Tools/msvc.py
+++ b/third_party/waf/wafadmin/Tools/msvc.py
@@ -729,15 +729,15 @@ def exec_mf(self):
 	self.do_manifest = False
 
 	outfile = self.outputs[0].bldpath(env)
-	
+
 	manifest = None
 	for out_node in self.outputs:
 		if out_node.name.endswith('.manifest'):
 			manifest = out_node.bldpath(env)
 			break
 	if manifest is None:
-		# Should never get here.  If we do, it means the manifest file was 
-		# never added to the outputs list, thus we don't have a manifest file 
+		# Should never get here.  If we do, it means the manifest file was
+		# never added to the outputs list, thus we don't have a manifest file
 		# to embed, so we just return.
 		return 0
 
@@ -794,4 +794,3 @@ for k in 'cc cxx winrc cc_link cxx_link static_link qxx'.split():
 	cls = Task.TaskBase.classes.get(k, None)
 	if cls:
 		cls.exec_command = exec_command_msvc
-
diff --git a/buildtools/wafadmin/Tools/nasm.py b/third_party/waf/wafadmin/Tools/nasm.py
index b99c3c73404..43b73a7e483 100644
--- a/buildtools/wafadmin/Tools/nasm.py
+++ b/third_party/waf/wafadmin/Tools/nasm.py
@@ -36,7 +36,7 @@ def nasm_file(self, node):
 	try: obj_ext = self.obj_ext
 	except AttributeError: obj_ext = '_%d.o' % self.idx
 
- 	task = self.create_task('nasm', node, node.change_ext(obj_ext))
+	task = self.create_task('nasm', node, node.change_ext(obj_ext))
 	self.compiled_tasks.append(task)
 
 	self.meths.append('apply_nasm_vars')
@@ -46,4 +46,3 @@ Task.simple_task_type('nasm', nasm_str, color='BLUE', ext_out='.o', shell=False)
 
 def detect(conf):
 	nasm = conf.find_program(['nasm', 'yasm'], var='NASM', mandatory=True)
-
diff --git a/buildtools/wafadmin/Tools/ocaml.py b/third_party/waf/wafadmin/Tools/ocaml.py
index 20c926969a1..a0667a4d257 100644
--- a/buildtools/wafadmin/Tools/ocaml.py
+++ b/third_party/waf/wafadmin/Tools/ocaml.py
@@ -295,4 +295,3 @@ def detect(conf):
 	v['LIBPATH_OCAML'] = Utils.cmd_output(conf.env['OCAMLC']+' -where').strip()+os.sep
 	v['CPPPATH_OCAML'] = Utils.cmd_output(conf.env['OCAMLC']+' -where').strip()+os.sep
 	v['LIB_OCAML'] = 'camlrun'
-
diff --git a/buildtools/wafadmin/Tools/osx.py b/third_party/waf/wafadmin/Tools/osx.py
index 561eca487de..88ca0d950aa 100644
--- a/buildtools/wafadmin/Tools/osx.py
+++ b/third_party/waf/wafadmin/Tools/osx.py
@@ -185,4 +185,3 @@ def plist_build(task):
 
 Task.task_type_from_func('macapp', vars=[], func=app_build, after="cxx_link cc_link static_link")
 Task.task_type_from_func('macplist', vars=[], func=plist_build, after="cxx_link cc_link static_link")
-
diff --git a/buildtools/wafadmin/Tools/perl.py b/third_party/waf/wafadmin/Tools/perl.py
index a6787a86ecf..85105ead88f 100644
--- a/buildtools/wafadmin/Tools/perl.py
+++ b/third_party/waf/wafadmin/Tools/perl.py
@@ -106,4 +106,3 @@ def check_perl_ext_devel(conf):
 def set_options(opt):
 	opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None)
 	opt.add_option("--with-perl-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None)
-
diff --git a/buildtools/wafadmin/Tools/preproc.py b/third_party/waf/wafadmin/Tools/preproc.py
index 6c49326ec3e..71eb05ae092 100644
--- a/buildtools/wafadmin/Tools/preproc.py
+++ b/third_party/waf/wafadmin/Tools/preproc.py
@@ -835,5 +835,3 @@ def get_deps_simple(node, env, nodepaths=[], defines={}):
 
 	find_deps(node)
 	return (nodes, names)
-
-
diff --git a/buildtools/wafadmin/Tools/python.py b/third_party/waf/wafadmin/Tools/python.py
index 35c61c24664..cfc8495e919 100644
--- a/buildtools/wafadmin/Tools/python.py
+++ b/third_party/waf/wafadmin/Tools/python.py
@@ -426,4 +426,3 @@ def set_options(opt):
 			default=1,
 			help='Do not install optimised compiled .pyo files (configuration) [Default:install]',
 			dest='pyo')
-
diff --git a/buildtools/wafadmin/Tools/qt4.py b/third_party/waf/wafadmin/Tools/qt4.py
index 84d121a844f..7d2cad7d9c1 100644
--- a/buildtools/wafadmin/Tools/qt4.py
+++ b/third_party/waf/wafadmin/Tools/qt4.py
@@ -502,4 +502,3 @@ def set_options(opt):
 		opt.add_option('--no-qt4-framework', action="store_false", help='do not use the framework version of Qt4 in OS X', dest='use_qt4_osxframework',default=True)
 
 	opt.add_option('--translate', action="store_true", help="collect translation strings", dest="trans_qt4", default=False)
-
diff --git a/buildtools/wafadmin/Tools/ruby.py b/third_party/waf/wafadmin/Tools/ruby.py
index d3b75695aec..afa8a596b0d 100644
--- a/buildtools/wafadmin/Tools/ruby.py
+++ b/third_party/waf/wafadmin/Tools/ruby.py
@@ -117,4 +117,3 @@ def set_options(opt):
 	opt.add_option('--with-ruby-archdir', type='string', dest='rubyarchdir', help='Specify directory where to install arch specific files')
 	opt.add_option('--with-ruby-libdir', type='string', dest='rubylibdir', help='Specify alternate ruby library path')
 	opt.add_option('--with-ruby-binary', type='string', dest='rubybinary', help='Specify alternate ruby binary')
-
diff --git a/buildtools/wafadmin/Tools/suncc.py b/third_party/waf/wafadmin/Tools/suncc.py
index b1a2aad4037..b1a2aad4037 100644
--- a/buildtools/wafadmin/Tools/suncc.py
+++ b/third_party/waf/wafadmin/Tools/suncc.py
diff --git a/buildtools/wafadmin/Tools/suncxx.py b/third_party/waf/wafadmin/Tools/suncxx.py
index 8754b6cc2bf..8754b6cc2bf 100644
--- a/buildtools/wafadmin/Tools/suncxx.py
+++ b/third_party/waf/wafadmin/Tools/suncxx.py
diff --git a/buildtools/wafadmin/Tools/tex.py b/third_party/waf/wafadmin/Tools/tex.py
index 700c54fc6e4..43aee1f4271 100644
--- a/buildtools/wafadmin/Tools/tex.py
+++ b/third_party/waf/wafadmin/Tools/tex.py
@@ -248,4 +248,3 @@ cls = b('latex', latex_build, vars=latex_vardeps)
 cls.scan = scan
 cls = b('pdflatex', pdflatex_build, vars=pdflatex_vardeps)
 cls.scan = scan
-
diff --git a/buildtools/wafadmin/Tools/unittestw.py b/third_party/waf/wafadmin/Tools/unittestw.py
index 0e30a510fb5..7cf2ded9918 100644
--- a/buildtools/wafadmin/Tools/unittestw.py
+++ b/third_party/waf/wafadmin/Tools/unittestw.py
@@ -306,5 +306,3 @@ def summary(bld):
 		for (f, code, out, err) in lst:
 			if code:
 				Utils.pprint('CYAN', '    %s' % f)
-
-
diff --git a/buildtools/wafadmin/Tools/vala.py b/third_party/waf/wafadmin/Tools/vala.py
index 753ee8d94e2..df1d11bb839 100644
--- a/buildtools/wafadmin/Tools/vala.py
+++ b/third_party/waf/wafadmin/Tools/vala.py
@@ -305,4 +305,3 @@ def set_options (opt):
 	valaopts.add_option ('--vala-target-glib', default=None,
 	                     dest='vala_target_glib', metavar='MAJOR.MINOR',
 	                     help='Target version of glib for Vala GObject code generation')
-
diff --git a/buildtools/wafadmin/Tools/winres.py b/third_party/waf/wafadmin/Tools/winres.py
index 2500d431de9..6b5aad004cc 100644
--- a/buildtools/wafadmin/Tools/winres.py
+++ b/third_party/waf/wafadmin/Tools/winres.py
@@ -42,4 +42,3 @@ def detect(conf):
 		conf.fatal('winrc was not found!')
 
 	v['WINRCFLAGS'] = ''
-
diff --git a/buildtools/wafadmin/Tools/xlc.py b/third_party/waf/wafadmin/Tools/xlc.py
index e33b7a16458..e33b7a16458 100644
--- a/buildtools/wafadmin/Tools/xlc.py
+++ b/third_party/waf/wafadmin/Tools/xlc.py
diff --git a/buildtools/wafadmin/Tools/xlcxx.py b/third_party/waf/wafadmin/Tools/xlcxx.py
index 6e84662a64c..6e84662a64c 100644
--- a/buildtools/wafadmin/Tools/xlcxx.py
+++ b/third_party/waf/wafadmin/Tools/xlcxx.py
diff --git a/buildtools/wafadmin/Utils.py b/third_party/waf/wafadmin/Utils.py
index cff6719261d..5a59a4c30a3 100644
--- a/buildtools/wafadmin/Utils.py
+++ b/third_party/waf/wafadmin/Utils.py
@@ -723,4 +723,3 @@ def run_once(fun):
 			return ret
 	wrap.__cache__ = cache
 	return wrap
-
diff --git a/buildtools/wafadmin/__init__.py b/third_party/waf/wafadmin/__init__.py
index 01273cfd02d..01273cfd02d 100644
--- a/buildtools/wafadmin/__init__.py
+++ b/third_party/waf/wafadmin/__init__.py
diff --git a/buildtools/wafadmin/ansiterm.py b/third_party/waf/wafadmin/ansiterm.py
index 720b79c5358..2ec0b4c9640 100644
--- a/buildtools/wafadmin/ansiterm.py
+++ b/third_party/waf/wafadmin/ansiterm.py
@@ -233,4 +233,3 @@ else:
 
 	sys.stderr = sys.stdout = AnsiTerm()
 	os.environ['TERM'] = 'vt100'
-
diff --git a/buildtools/wafadmin/pproc.py b/third_party/waf/wafadmin/pproc.py
index cb15178b4eb..44b9dd2f260 100644
--- a/buildtools/wafadmin/pproc.py
+++ b/third_party/waf/wafadmin/pproc.py
@@ -617,4 +617,3 @@ class Popen(object):
 
             self.wait()
             return (stdout, stderr)
-
diff --git a/buildtools/wafadmin/py3kfixes.py b/third_party/waf/wafadmin/py3kfixes.py
index 2f3c9c29776..1a647062e7b 100644
--- a/buildtools/wafadmin/py3kfixes.py
+++ b/third_party/waf/wafadmin/py3kfixes.py
@@ -127,4 +127,3 @@ def fixdir(dir):
 		for v in all_modifs[k]:
 			modif(os.path.join(dir, 'wafadmin'), k, v)
 	#print('substitutions finished')
-