Move waf into third_party/.

Signed-Off-By: Jelmer Vernooij <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>

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')

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):

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):

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')

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):

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',

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')

selftest/tests.py

@@ -65,7 +65,7 @@
 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"),

buildtools/wafadmin/3rdparty/ParallelDebug.py → third_party/waf/wafadmin/3rdparty/ParallelDebug.py

@@ -295,5 +295,3 @@ def process_colors(producer):
 	#node = producer.bld.path.make_node('pdebug.svg')
 	f = open('pdebug.svg', 'w')
 	f.write("".join(out))
-
-

buildtools/wafadmin/3rdparty/batched_cc.py → third_party/waf/wafadmin/3rdparty/batched_cc.py

@@ -180,4 +180,3 @@ def can_retrieve_cache(self):
 	setattr(t, 'post_run', post_run)
 	setattr(t, 'old_can_retrieve_cache', t.can_retrieve_cache)
 	setattr(t, 'can_retrieve_cache', can_retrieve_cache)
-

buildtools/wafadmin/3rdparty/boost.py → 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
-

buildtools/wafadmin/3rdparty/build_file_tracker.py → 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
-

buildtools/wafadmin/3rdparty/fluid.py → 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)
-

buildtools/wafadmin/3rdparty/gccdeps.py → third_party/waf/wafadmin/3rdparty/gccdeps.py

@@ -125,4 +125,3 @@ def sig_implicit_deps(self):
 		cls.post_run = post_run
 		cls.scan = scan
 		cls.sig_implicit_deps = sig_implicit_deps
-

buildtools/wafadmin/3rdparty/go.py → 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)
-

buildtools/wafadmin/3rdparty/lru_cache.py → 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
-

buildtools/wafadmin/3rdparty/paranoid.py → 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
-

buildtools/wafadmin/3rdparty/prefork.py → third_party/waf/wafadmin/3rdparty/prefork.py

@@ -273,4 +273,3 @@ def __init__(self):
 	def build(bld):
 		# dangerous, there is no other command hopefully
 		Utils.exec_command = exec_command
-

buildtools/wafadmin/3rdparty/swig.py → 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)
-

buildtools/wafadmin/3rdparty/valadoc.py → 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)
-

buildtools/wafadmin/Build.py → third_party/waf/wafadmin/Build.py

@@ -1030,4 +1030,3 @@ def use_the_magic(self):
 	install_as = group_method(install_as)
 	install_files = group_method(install_files)
 	symlink_as = group_method(symlink_as)
-

buildtools/wafadmin/Configure.py → 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)
-
-

buildtools/wafadmin/Constants.py → third_party/waf/wafadmin/Constants.py

@@ -73,4 +73,3 @@
 # negative '<-' uninstall
 INSTALL = 1337
 UNINSTALL = -1337
-

buildtools/wafadmin/Environment.py → third_party/waf/wafadmin/Environment.py

@@ -207,4 +207,3 @@ def __delattr__(self, name):
 			object.__delattr__(self, name)
 		else:
 			del self[name]
-

buildtools/wafadmin/Logs.py → third_party/waf/wafadmin/Logs.py

@@ -131,4 +131,3 @@ def init_log():
 
 # may be initialized more than once
 init_log()
-

buildtools/wafadmin/Node.py → third_party/waf/wafadmin/Node.py

@@ -692,4 +692,3 @@ def update_build_dir(self, env=None):
 
 class Nodu(Node):
 	pass
-

buildtools/wafadmin/Options.py → third_party/waf/wafadmin/Options.py

@@ -285,4 +285,3 @@ def tool_options(self, *k, **kw):
 
 	def parse_args(self, args=None):
 		parse_args_impl(self.parser, args)
-

buildtools/wafadmin/Runner.py → third_party/waf/wafadmin/Runner.py

@@ -233,4 +233,3 @@ def start(self):
 
 		#print loop
 		assert (self.count == 0 or self.stop)
-

buildtools/wafadmin/Scripting.py → 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')
-

buildtools/wafadmin/Task.py → third_party/waf/wafadmin/Task.py

@@ -1197,4 +1197,3 @@ def extract_deps(tasks):
 			delattr(x, 'cache_sig')
 		except AttributeError:
 			pass
-

buildtools/wafadmin/TaskGen.py → third_party/waf/wafadmin/TaskGen.py

@@ -291,8 +291,8 @@ def find_sources_in_dirs(self, dirnames, excludes=[], exts=[]):
 		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)
-

buildtools/wafadmin/Tools/__init__.py → third_party/waf/wafadmin/Tools/__init__.py

@@ -1,4 +1,3 @@
 #!/usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2006 (ita)
-

buildtools/wafadmin/Tools/ar.py → 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')
-
-

buildtools/wafadmin/Tools/bison.py → 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'
-

buildtools/wafadmin/Tools/cc.py → third_party/waf/wafadmin/Tools/cc.py

@@ -97,4 +97,3 @@ def c_hook(self, node):
 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
-

buildtools/wafadmin/Tools/ccroot.py → third_party/waf/wafadmin/Tools/ccroot.py

@@ -637,4 +637,3 @@ def exec_vnum_link(self):
 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')
-

buildtools/wafadmin/Tools/compiler_cc.py → 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)
-

buildtools/wafadmin/Tools/compiler_cxx.py → 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)
-

buildtools/wafadmin/Tools/compiler_d.py → 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)
-

buildtools/wafadmin/Tools/config_c.py → 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')
-

buildtools/wafadmin/Tools/cs.py → 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')
-

buildtools/wafadmin/Tools/cxx.py → third_party/waf/wafadmin/Tools/cxx.py

@@ -101,4 +101,3 @@ def cxx_hook(self, node):
 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
-

buildtools/wafadmin/Tools/d.py → third_party/waf/wafadmin/Tools/d.py

@@ -532,4 +532,3 @@ def check_dlibrary(conf):
 		print imp + " ",
 	print
 """
-

buildtools/wafadmin/Tools/dbus.py → third_party/waf/wafadmin/Tools/dbus.py

@@ -31,4 +31,3 @@ def process_dbus(self):
 
 def detect(conf):
 	dbus_binding_tool = conf.find_program('dbus-binding-tool', var='DBUS_BINDING_TOOL')
-

buildtools/wafadmin/Tools/dmd.py → 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()
-

buildtools/wafadmin/Tools/flex.py → third_party/waf/wafadmin/Tools/flex.py

@@ -22,4 +22,3 @@ def decide_ext(self, node):
 def detect(conf):
 	conf.find_program('flex', var='FLEX', mandatory=True)
 	conf.env['FLEXFLAGS'] = ''
-

buildtools/wafadmin/Tools/gas.py → 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
-

buildtools/wafadmin/Tools/gcc.py → 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()
-

buildtools/wafadmin/Tools/gdc.py → 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()
-

buildtools/wafadmin/Tools/glib2.py → third_party/waf/wafadmin/Tools/glib2.py

@@ -161,4 +161,3 @@ def process_enums(self):
 def detect(conf):
 	glib_genmarshal = conf.find_program('glib-genmarshal', var='GLIB_GENMARSHAL')
 	mk_enums_tool = conf.find_program('glib-mkenums', var='GLIB_MKENUMS')
-

buildtools/wafadmin/Tools/gnome.py → third_party/waf/wafadmin/Tools/gnome.py

@@ -220,4 +220,3 @@ def getstr(varname):
 
 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]')
-

buildtools/wafadmin/Tools/gnu_dirs.py → 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())
-

buildtools/wafadmin/Tools/gob2.py → 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'] = ''
-

buildtools/wafadmin/Tools/gxx.py → 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()
-

buildtools/wafadmin/Tools/intltool.py → third_party/waf/wafadmin/Tools/intltool.py

@@ -136,4 +136,3 @@ def getstr(varname):
 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')
-

buildtools/wafadmin/Tools/javaw.py → 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)
-

buildtools/wafadmin/Tools/kde4.py → 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)
-

buildtools/wafadmin/Tools/libtool.py → third_party/waf/wafadmin/Tools/libtool.py

@@ -327,4 +327,3 @@ def p(x):
 
 if __name__ == '__main__':
 	useCmdLine()
-

buildtools/wafadmin/Tools/lua.py → 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)
-

buildtools/wafadmin/Tools/misc.py → 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
-

buildtools/wafadmin/Tools/msvc.py → 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 @@ def exec_command_msvc(self, *k, **kw):
 	cls = Task.TaskBase.classes.get(k, None)
 	if cls:
 		cls.exec_command = exec_command_msvc
-

buildtools/wafadmin/Tools/nasm.py → 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 @@ def nasm_file(self, node):
 
 def detect(conf):
 	nasm = conf.find_program(['nasm', 'yasm'], var='NASM', mandatory=True)
-

buildtools/wafadmin/Tools/ocaml.py → 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'
-