From 90ec37cf90035576bcab4d7b36214c9c19a52d24 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 25 Mar 2015 11:13:40 +0000 Subject: [PATCH] Move waf into third_party/. Signed-Off-By: Jelmer Vernooij Reviewed-by: Jeremy Allison --- buildtools/bin/waf | 2 +- ctdb/wscript | 2 +- lib/ldb/wscript | 2 +- lib/replace/wscript | 2 +- lib/talloc/wscript | 3 ++- lib/tdb/wscript | 2 +- lib/tevent/wscript | 2 +- selftest/tests.py | 2 +- .../waf}/wafadmin/3rdparty/ParallelDebug.py | 2 -- .../waf}/wafadmin/3rdparty/batched_cc.py | 1 - {buildtools => third_party/waf}/wafadmin/3rdparty/boost.py | 1 - .../waf}/wafadmin/3rdparty/build_file_tracker.py | 1 - {buildtools => third_party/waf}/wafadmin/3rdparty/fluid.py | 1 - .../waf}/wafadmin/3rdparty/gccdeps.py | 1 - {buildtools => third_party/waf}/wafadmin/3rdparty/go.py | 1 - .../waf}/wafadmin/3rdparty/lru_cache.py | 1 - .../waf}/wafadmin/3rdparty/paranoid.py | 1 - .../waf}/wafadmin/3rdparty/prefork.py | 1 - {buildtools => third_party/waf}/wafadmin/3rdparty/swig.py | 1 - .../waf}/wafadmin/3rdparty/valadoc.py | 1 - {buildtools => third_party/waf}/wafadmin/Build.py | 1 - {buildtools => third_party/waf}/wafadmin/Configure.py | 2 -- {buildtools => third_party/waf}/wafadmin/Constants.py | 1 - {buildtools => third_party/waf}/wafadmin/Environment.py | 1 - {buildtools => third_party/waf}/wafadmin/Logs.py | 1 - {buildtools => third_party/waf}/wafadmin/Node.py | 1 - {buildtools => third_party/waf}/wafadmin/Options.py | 1 - {buildtools => third_party/waf}/wafadmin/Runner.py | 1 - {buildtools => third_party/waf}/wafadmin/Scripting.py | 1 - {buildtools => third_party/waf}/wafadmin/Task.py | 1 - {buildtools => third_party/waf}/wafadmin/TaskGen.py | 5 ++--- {buildtools => third_party/waf}/wafadmin/Tools/__init__.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/ar.py | 2 -- {buildtools => third_party/waf}/wafadmin/Tools/bison.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/cc.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/ccroot.py | 1 - .../waf}/wafadmin/Tools/compiler_cc.py | 1 - .../waf}/wafadmin/Tools/compiler_cxx.py | 1 - .../waf}/wafadmin/Tools/compiler_d.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/config_c.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/cs.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/cxx.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/d.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/dbus.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/dmd.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/flex.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gas.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gcc.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gdc.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/glib2.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gnome.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gnu_dirs.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gob2.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/gxx.py | 3 +-- {buildtools => third_party/waf}/wafadmin/Tools/icc.py | 0 {buildtools => third_party/waf}/wafadmin/Tools/icpc.py | 0 {buildtools => third_party/waf}/wafadmin/Tools/intltool.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/javaw.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/kde4.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/libtool.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/lua.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/misc.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/msvc.py | 7 +++---- {buildtools => third_party/waf}/wafadmin/Tools/nasm.py | 3 +-- {buildtools => third_party/waf}/wafadmin/Tools/ocaml.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/osx.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/perl.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/preproc.py | 2 -- {buildtools => third_party/waf}/wafadmin/Tools/python.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/qt4.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/ruby.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/suncc.py | 0 {buildtools => third_party/waf}/wafadmin/Tools/suncxx.py | 0 {buildtools => third_party/waf}/wafadmin/Tools/tex.py | 1 - .../waf}/wafadmin/Tools/unittestw.py | 2 -- {buildtools => third_party/waf}/wafadmin/Tools/vala.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/winres.py | 1 - {buildtools => third_party/waf}/wafadmin/Tools/xlc.py | 0 {buildtools => third_party/waf}/wafadmin/Tools/xlcxx.py | 0 {buildtools => third_party/waf}/wafadmin/Utils.py | 1 - {buildtools => third_party/waf}/wafadmin/__init__.py | 0 {buildtools => third_party/waf}/wafadmin/ansiterm.py | 1 - {buildtools => third_party/waf}/wafadmin/pproc.py | 1 - {buildtools => third_party/waf}/wafadmin/py3kfixes.py | 1 - 84 files changed, 16 insertions(+), 89 deletions(-) rename {buildtools => third_party/waf}/wafadmin/3rdparty/ParallelDebug.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/batched_cc.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/boost.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/build_file_tracker.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/fluid.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/gccdeps.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/go.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/lru_cache.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/paranoid.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/prefork.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/swig.py (99%) rename {buildtools => third_party/waf}/wafadmin/3rdparty/valadoc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Build.py (99%) rename {buildtools => third_party/waf}/wafadmin/Configure.py (99%) rename {buildtools => third_party/waf}/wafadmin/Constants.py (99%) rename {buildtools => third_party/waf}/wafadmin/Environment.py (99%) rename {buildtools => third_party/waf}/wafadmin/Logs.py (99%) rename {buildtools => third_party/waf}/wafadmin/Node.py (99%) rename {buildtools => third_party/waf}/wafadmin/Options.py (99%) rename {buildtools => third_party/waf}/wafadmin/Runner.py (99%) rename {buildtools => third_party/waf}/wafadmin/Scripting.py (99%) rename {buildtools => third_party/waf}/wafadmin/Task.py (99%) rename {buildtools => third_party/waf}/wafadmin/TaskGen.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/__init__.py (98%) rename {buildtools => third_party/waf}/wafadmin/Tools/ar.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/bison.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/cc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/ccroot.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/compiler_cc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/compiler_cxx.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/compiler_d.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/config_c.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/cs.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/cxx.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/d.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/dbus.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/dmd.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/flex.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gas.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gcc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gdc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/glib2.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gnome.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gnu_dirs.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gob2.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/gxx.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/icc.py (100%) rename {buildtools => third_party/waf}/wafadmin/Tools/icpc.py (100%) rename {buildtools => third_party/waf}/wafadmin/Tools/intltool.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/javaw.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/kde4.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/libtool.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/lua.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/misc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/msvc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/nasm.py (95%) rename {buildtools => third_party/waf}/wafadmin/Tools/ocaml.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/osx.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/perl.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/preproc.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/python.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/qt4.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/ruby.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/suncc.py (100%) rename {buildtools => third_party/waf}/wafadmin/Tools/suncxx.py (100%) rename {buildtools => third_party/waf}/wafadmin/Tools/tex.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/unittestw.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/vala.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/winres.py (99%) rename {buildtools => third_party/waf}/wafadmin/Tools/xlc.py (100%) rename {buildtools => third_party/waf}/wafadmin/Tools/xlcxx.py (100%) rename {buildtools => third_party/waf}/wafadmin/Utils.py (99%) rename {buildtools => third_party/waf}/wafadmin/__init__.py (100%) rename {buildtools => third_party/waf}/wafadmin/ansiterm.py (99%) rename {buildtools => third_party/waf}/wafadmin/pproc.py (99%) rename {buildtools => third_party/waf}/wafadmin/py3kfixes.py (99%) diff --git a/buildtools/bin/waf b/buildtools/bin/waf index db6a7d3386a1..1b0f4662a56d 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 f0b68cdcc189..cd0226225fbd 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 886b3e7518ce..65a684307d4b 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 19494484696a..8a203c778d49 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 9efc895b5589..a1b72a076137 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 b283795870b7..fdc5d2fd37ca 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 0da82326bccb..026cd9a1c1b4 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 cceb6e4f4715..1185142afc53 100644 --- a/selftest/tests.py +++ b/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"), diff --git a/buildtools/wafadmin/3rdparty/ParallelDebug.py b/third_party/waf/wafadmin/3rdparty/ParallelDebug.py similarity index 99% rename from buildtools/wafadmin/3rdparty/ParallelDebug.py rename to third_party/waf/wafadmin/3rdparty/ParallelDebug.py index 9d0493e5e172..0ff580ece27c 100644 --- a/buildtools/wafadmin/3rdparty/ParallelDebug.py +++ b/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)) - - diff --git a/buildtools/wafadmin/3rdparty/batched_cc.py b/third_party/waf/wafadmin/3rdparty/batched_cc.py similarity index 99% rename from buildtools/wafadmin/3rdparty/batched_cc.py rename to third_party/waf/wafadmin/3rdparty/batched_cc.py index 8e310745c633..7ed569ccb709 100644 --- a/buildtools/wafadmin/3rdparty/batched_cc.py +++ b/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) - diff --git a/buildtools/wafadmin/3rdparty/boost.py b/third_party/waf/wafadmin/3rdparty/boost.py similarity index 99% rename from buildtools/wafadmin/3rdparty/boost.py rename to third_party/waf/wafadmin/3rdparty/boost.py index e690a4e2740f..1cbbf7e850dc 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/build_file_tracker.py rename to third_party/waf/wafadmin/3rdparty/build_file_tracker.py index 9c48928fc02e..5fc73581ec25 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/fluid.py rename to third_party/waf/wafadmin/3rdparty/fluid.py index 117edef7200b..c858fe311cbe 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/gccdeps.py rename to third_party/waf/wafadmin/3rdparty/gccdeps.py index 6600c9ca3ba5..28a889d78b63 100644 --- a/buildtools/wafadmin/3rdparty/gccdeps.py +++ b/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 - diff --git a/buildtools/wafadmin/3rdparty/go.py b/third_party/waf/wafadmin/3rdparty/go.py similarity index 99% rename from buildtools/wafadmin/3rdparty/go.py rename to third_party/waf/wafadmin/3rdparty/go.py index 2d8df0d2b64e..f8397c7e1c7f 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/lru_cache.py rename to third_party/waf/wafadmin/3rdparty/lru_cache.py index 5b00abc29beb..96f0e6cf1093 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/paranoid.py rename to third_party/waf/wafadmin/3rdparty/paranoid.py index ead64ea5c3aa..ba6d75289494 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/prefork.py rename to third_party/waf/wafadmin/3rdparty/prefork.py index 1c760c27bbad..88fb4e406193 100755 --- a/buildtools/wafadmin/3rdparty/prefork.py +++ b/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 - diff --git a/buildtools/wafadmin/3rdparty/swig.py b/third_party/waf/wafadmin/3rdparty/swig.py similarity index 99% rename from buildtools/wafadmin/3rdparty/swig.py rename to third_party/waf/wafadmin/3rdparty/swig.py index c0a4108700e7..393e8e190a09 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 similarity index 99% rename from buildtools/wafadmin/3rdparty/valadoc.py rename to third_party/waf/wafadmin/3rdparty/valadoc.py index d0a9fe80ed64..bdb0c6bd5b8f 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 similarity index 99% rename from buildtools/wafadmin/Build.py rename to third_party/waf/wafadmin/Build.py index 8e7c72c4ed70..50f4d7f6c69e 100644 --- a/buildtools/wafadmin/Build.py +++ b/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) - diff --git a/buildtools/wafadmin/Configure.py b/third_party/waf/wafadmin/Configure.py similarity index 99% rename from buildtools/wafadmin/Configure.py rename to third_party/waf/wafadmin/Configure.py index 35b4e51ec35a..7575cefd0e19 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 similarity index 99% rename from buildtools/wafadmin/Constants.py rename to third_party/waf/wafadmin/Constants.py index e67dda6ecd8c..30960b978d1b 100644 --- a/buildtools/wafadmin/Constants.py +++ b/third_party/waf/wafadmin/Constants.py @@ -73,4 +73,3 @@ # negative '<-' uninstall INSTALL = 1337 UNINSTALL = -1337 - diff --git a/buildtools/wafadmin/Environment.py b/third_party/waf/wafadmin/Environment.py similarity index 99% rename from buildtools/wafadmin/Environment.py rename to third_party/waf/wafadmin/Environment.py index 52c83b4f3e45..bea414651656 100644 --- a/buildtools/wafadmin/Environment.py +++ b/third_party/waf/wafadmin/Environment.py @@ -207,4 +207,3 @@ def __delattr__(self, name): object.__delattr__(self, name) else: del self[name] - diff --git a/buildtools/wafadmin/Logs.py b/third_party/waf/wafadmin/Logs.py similarity index 99% rename from buildtools/wafadmin/Logs.py rename to third_party/waf/wafadmin/Logs.py index c160b3773664..f67e87c72128 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 similarity index 99% rename from buildtools/wafadmin/Node.py rename to third_party/waf/wafadmin/Node.py index 4fa205c96bec..158a4a4d4701 100644 --- a/buildtools/wafadmin/Node.py +++ b/third_party/waf/wafadmin/Node.py @@ -692,4 +692,3 @@ def update_build_dir(self, env=None): class Nodu(Node): pass - diff --git a/buildtools/wafadmin/Options.py b/third_party/waf/wafadmin/Options.py similarity index 99% rename from buildtools/wafadmin/Options.py rename to third_party/waf/wafadmin/Options.py index c9ddcfe65031..7e87c1109028 100644 --- a/buildtools/wafadmin/Options.py +++ b/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) - diff --git a/buildtools/wafadmin/Runner.py b/third_party/waf/wafadmin/Runner.py similarity index 99% rename from buildtools/wafadmin/Runner.py rename to third_party/waf/wafadmin/Runner.py index 94db0fbd1ba4..0d2dea5ef47c 100644 --- a/buildtools/wafadmin/Runner.py +++ b/third_party/waf/wafadmin/Runner.py @@ -233,4 +233,3 @@ def start(self): #print loop assert (self.count == 0 or self.stop) - diff --git a/buildtools/wafadmin/Scripting.py b/third_party/waf/wafadmin/Scripting.py similarity index 99% rename from buildtools/wafadmin/Scripting.py rename to third_party/waf/wafadmin/Scripting.py index d975bd934d13..6f6110487db9 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 similarity index 99% rename from buildtools/wafadmin/Task.py rename to third_party/waf/wafadmin/Task.py index 5cda2ec7301f..59d10203a496 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 similarity index 99% rename from buildtools/wafadmin/TaskGen.py rename to third_party/waf/wafadmin/TaskGen.py index 52d0236c8509..5900809ddfed 100644 --- a/buildtools/wafadmin/TaskGen.py +++ b/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) - diff --git a/buildtools/wafadmin/Tools/__init__.py b/third_party/waf/wafadmin/Tools/__init__.py similarity index 98% rename from buildtools/wafadmin/Tools/__init__.py rename to third_party/waf/wafadmin/Tools/__init__.py index bc6ca230b5e9..8f026e187ff6 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 similarity index 99% rename from buildtools/wafadmin/Tools/ar.py rename to third_party/waf/wafadmin/Tools/ar.py index af9b17fd6e99..3571670d5b50 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 similarity index 99% rename from buildtools/wafadmin/Tools/bison.py rename to third_party/waf/wafadmin/Tools/bison.py index 49c605187336..c281e61ddaff 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 similarity index 99% rename from buildtools/wafadmin/Tools/cc.py rename to third_party/waf/wafadmin/Tools/cc.py index 903a1c5038c8..e54df4715e5d 100644 --- a/buildtools/wafadmin/Tools/cc.py +++ b/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 - diff --git a/buildtools/wafadmin/Tools/ccroot.py b/third_party/waf/wafadmin/Tools/ccroot.py similarity index 99% rename from buildtools/wafadmin/Tools/ccroot.py rename to third_party/waf/wafadmin/Tools/ccroot.py index 25c5179be0e0..c130b40a21dc 100644 --- a/buildtools/wafadmin/Tools/ccroot.py +++ b/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') - diff --git a/buildtools/wafadmin/Tools/compiler_cc.py b/third_party/waf/wafadmin/Tools/compiler_cc.py similarity index 99% rename from buildtools/wafadmin/Tools/compiler_cc.py rename to third_party/waf/wafadmin/Tools/compiler_cc.py index 0421503f7c93..642458aba613 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 similarity index 99% rename from buildtools/wafadmin/Tools/compiler_cxx.py rename to third_party/waf/wafadmin/Tools/compiler_cxx.py index 5308ea97199e..aa0b0e7d460a 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 similarity index 99% rename from buildtools/wafadmin/Tools/compiler_d.py rename to third_party/waf/wafadmin/Tools/compiler_d.py index 1ea5efa30e8b..378277a25aaa 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 similarity index 99% rename from buildtools/wafadmin/Tools/config_c.py rename to third_party/waf/wafadmin/Tools/config_c.py index d0bc61773625..9f1103cb27d5 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 similarity index 99% rename from buildtools/wafadmin/Tools/cs.py rename to third_party/waf/wafadmin/Tools/cs.py index 43544856f340..4c987d2a875f 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 similarity index 99% rename from buildtools/wafadmin/Tools/cxx.py rename to third_party/waf/wafadmin/Tools/cxx.py index 719b82177c15..184fee3e0654 100644 --- a/buildtools/wafadmin/Tools/cxx.py +++ b/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 - diff --git a/buildtools/wafadmin/Tools/d.py b/third_party/waf/wafadmin/Tools/d.py similarity index 99% rename from buildtools/wafadmin/Tools/d.py rename to third_party/waf/wafadmin/Tools/d.py index 1a22821bc556..2c2e94857e36 100644 --- a/buildtools/wafadmin/Tools/d.py +++ b/third_party/waf/wafadmin/Tools/d.py @@ -532,4 +532,3 @@ def check_dlibrary(conf): print imp + " ", print """ - diff --git a/buildtools/wafadmin/Tools/dbus.py b/third_party/waf/wafadmin/Tools/dbus.py similarity index 99% rename from buildtools/wafadmin/Tools/dbus.py rename to third_party/waf/wafadmin/Tools/dbus.py index 317999939213..42c4ca2cb7fb 100644 --- a/buildtools/wafadmin/Tools/dbus.py +++ b/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') - diff --git a/buildtools/wafadmin/Tools/dmd.py b/third_party/waf/wafadmin/Tools/dmd.py similarity index 99% rename from buildtools/wafadmin/Tools/dmd.py rename to third_party/waf/wafadmin/Tools/dmd.py index 9c7490844db0..b86ffd6a0f41 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 similarity index 99% rename from buildtools/wafadmin/Tools/flex.py rename to third_party/waf/wafadmin/Tools/flex.py index 5ce9f2210e38..cbea42db2c94 100644 --- a/buildtools/wafadmin/Tools/flex.py +++ b/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'] = '' - diff --git a/buildtools/wafadmin/Tools/gas.py b/third_party/waf/wafadmin/Tools/gas.py similarity index 99% rename from buildtools/wafadmin/Tools/gas.py rename to third_party/waf/wafadmin/Tools/gas.py index c983b0a39591..5dd0b5d74607 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 similarity index 99% rename from buildtools/wafadmin/Tools/gcc.py rename to third_party/waf/wafadmin/Tools/gcc.py index a6be0b28dbf1..83d5b248ad9f 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 similarity index 99% rename from buildtools/wafadmin/Tools/gdc.py rename to third_party/waf/wafadmin/Tools/gdc.py index 4d2a3216edd5..d1e5e7b53cb7 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 similarity index 99% rename from buildtools/wafadmin/Tools/glib2.py rename to third_party/waf/wafadmin/Tools/glib2.py index 042d612cbe48..d3fc77697409 100644 --- a/buildtools/wafadmin/Tools/glib2.py +++ b/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') - diff --git a/buildtools/wafadmin/Tools/gnome.py b/third_party/waf/wafadmin/Tools/gnome.py similarity index 99% rename from buildtools/wafadmin/Tools/gnome.py rename to third_party/waf/wafadmin/Tools/gnome.py index c098a41bb4b6..da11e91d3d87 100644 --- a/buildtools/wafadmin/Tools/gnome.py +++ b/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]') - diff --git a/buildtools/wafadmin/Tools/gnu_dirs.py b/third_party/waf/wafadmin/Tools/gnu_dirs.py similarity index 99% rename from buildtools/wafadmin/Tools/gnu_dirs.py rename to third_party/waf/wafadmin/Tools/gnu_dirs.py index 856e4a7204b5..ac149dfa46b8 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 similarity index 99% rename from buildtools/wafadmin/Tools/gob2.py rename to third_party/waf/wafadmin/Tools/gob2.py index 00aaa32acda1..96d8e2030ca9 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 similarity index 99% rename from buildtools/wafadmin/Tools/gxx.py rename to third_party/waf/wafadmin/Tools/gxx.py index 4984122e5e62..38e8d00ae5b4 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 similarity index 100% rename from buildtools/wafadmin/Tools/icc.py rename to third_party/waf/wafadmin/Tools/icc.py diff --git a/buildtools/wafadmin/Tools/icpc.py b/third_party/waf/wafadmin/Tools/icpc.py similarity index 100% rename from buildtools/wafadmin/Tools/icpc.py rename to third_party/waf/wafadmin/Tools/icpc.py diff --git a/buildtools/wafadmin/Tools/intltool.py b/third_party/waf/wafadmin/Tools/intltool.py similarity index 99% rename from buildtools/wafadmin/Tools/intltool.py rename to third_party/waf/wafadmin/Tools/intltool.py index deb8f4a63414..5fb3df2cbbb8 100644 --- a/buildtools/wafadmin/Tools/intltool.py +++ b/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') - diff --git a/buildtools/wafadmin/Tools/javaw.py b/third_party/waf/wafadmin/Tools/javaw.py similarity index 99% rename from buildtools/wafadmin/Tools/javaw.py rename to third_party/waf/wafadmin/Tools/javaw.py index 301ebc426b9d..4d9f4c77907c 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 similarity index 99% rename from buildtools/wafadmin/Tools/kde4.py rename to third_party/waf/wafadmin/Tools/kde4.py index f480929da653..1f3bae783d38 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 similarity index 99% rename from buildtools/wafadmin/Tools/libtool.py rename to third_party/waf/wafadmin/Tools/libtool.py index 47fa906fcccb..bcc0e2f318d1 100644 --- a/buildtools/wafadmin/Tools/libtool.py +++ b/third_party/waf/wafadmin/Tools/libtool.py @@ -327,4 +327,3 @@ def p(x): if __name__ == '__main__': useCmdLine() - diff --git a/buildtools/wafadmin/Tools/lua.py b/third_party/waf/wafadmin/Tools/lua.py similarity index 99% rename from buildtools/wafadmin/Tools/lua.py rename to third_party/waf/wafadmin/Tools/lua.py index 5b181e1310fb..8a6c1f46e796 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 similarity index 99% rename from buildtools/wafadmin/Tools/misc.py rename to third_party/waf/wafadmin/Tools/misc.py index 9903ee4bd3ca..6ef45aef444b 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 similarity index 99% rename from buildtools/wafadmin/Tools/msvc.py rename to third_party/waf/wafadmin/Tools/msvc.py index 4fde8b146879..2a97d19a7ebc 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 @@ def exec_command_msvc(self, *k, **kw): 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 similarity index 95% rename from buildtools/wafadmin/Tools/nasm.py rename to third_party/waf/wafadmin/Tools/nasm.py index b99c3c734046..43b73a7e4839 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 @@ def nasm_file(self, node): 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 similarity index 99% rename from buildtools/wafadmin/Tools/ocaml.py rename to third_party/waf/wafadmin/Tools/ocaml.py index 20c926969a12..a0667a4d257e 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 similarity index 99% rename from buildtools/wafadmin/Tools/osx.py rename to third_party/waf/wafadmin/Tools/osx.py index 561eca487ded..88ca0d950aa9 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 similarity index 99% rename from buildtools/wafadmin/Tools/perl.py rename to third_party/waf/wafadmin/Tools/perl.py index a6787a86ecfa..85105ead88fd 100644 --- a/buildtools/wafadmin/Tools/perl.py +++ b/third_party/waf/wafadmin/Tools/perl.py @@ -106,4 +106,3 @@ def read_out(cmd): 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 similarity index 99% rename from buildtools/wafadmin/Tools/preproc.py rename to third_party/waf/wafadmin/Tools/preproc.py index 6c49326ec3e5..71eb05ae0929 100644 --- a/buildtools/wafadmin/Tools/preproc.py +++ b/third_party/waf/wafadmin/Tools/preproc.py @@ -835,5 +835,3 @@ def find_deps(node): find_deps(node) return (nodes, names) - - diff --git a/buildtools/wafadmin/Tools/python.py b/third_party/waf/wafadmin/Tools/python.py similarity index 99% rename from buildtools/wafadmin/Tools/python.py rename to third_party/waf/wafadmin/Tools/python.py index 35c61c24664e..cfc8495e9192 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 similarity index 99% rename from buildtools/wafadmin/Tools/qt4.py rename to third_party/waf/wafadmin/Tools/qt4.py index 84d121a844f1..7d2cad7d9c18 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 similarity index 99% rename from buildtools/wafadmin/Tools/ruby.py rename to third_party/waf/wafadmin/Tools/ruby.py index d3b75695aecc..afa8a596b0d8 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 similarity index 100% rename from buildtools/wafadmin/Tools/suncc.py rename to third_party/waf/wafadmin/Tools/suncc.py diff --git a/buildtools/wafadmin/Tools/suncxx.py b/third_party/waf/wafadmin/Tools/suncxx.py similarity index 100% rename from buildtools/wafadmin/Tools/suncxx.py rename to third_party/waf/wafadmin/Tools/suncxx.py diff --git a/buildtools/wafadmin/Tools/tex.py b/third_party/waf/wafadmin/Tools/tex.py similarity index 99% rename from buildtools/wafadmin/Tools/tex.py rename to third_party/waf/wafadmin/Tools/tex.py index 700c54fc6e4f..43aee1f42714 100644 --- a/buildtools/wafadmin/Tools/tex.py +++ b/third_party/waf/wafadmin/Tools/tex.py @@ -248,4 +248,3 @@ def detect(conf): 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 similarity index 99% rename from buildtools/wafadmin/Tools/unittestw.py rename to third_party/waf/wafadmin/Tools/unittestw.py index 0e30a510fb54..7cf2ded99181 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 similarity index 99% rename from buildtools/wafadmin/Tools/vala.py rename to third_party/waf/wafadmin/Tools/vala.py index 753ee8d94e28..df1d11bb8393 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 similarity index 99% rename from buildtools/wafadmin/Tools/winres.py rename to third_party/waf/wafadmin/Tools/winres.py index 2500d431de90..6b5aad004cc4 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 similarity index 100% rename from buildtools/wafadmin/Tools/xlc.py rename to third_party/waf/wafadmin/Tools/xlc.py diff --git a/buildtools/wafadmin/Tools/xlcxx.py b/third_party/waf/wafadmin/Tools/xlcxx.py similarity index 100% rename from buildtools/wafadmin/Tools/xlcxx.py rename to third_party/waf/wafadmin/Tools/xlcxx.py diff --git a/buildtools/wafadmin/Utils.py b/third_party/waf/wafadmin/Utils.py similarity index 99% rename from buildtools/wafadmin/Utils.py rename to third_party/waf/wafadmin/Utils.py index cff6719261d3..5a59a4c30a36 100644 --- a/buildtools/wafadmin/Utils.py +++ b/third_party/waf/wafadmin/Utils.py @@ -723,4 +723,3 @@ def wrap(k): return ret wrap.__cache__ = cache return wrap - diff --git a/buildtools/wafadmin/__init__.py b/third_party/waf/wafadmin/__init__.py similarity index 100% rename from buildtools/wafadmin/__init__.py rename to third_party/waf/wafadmin/__init__.py diff --git a/buildtools/wafadmin/ansiterm.py b/third_party/waf/wafadmin/ansiterm.py similarity index 99% rename from buildtools/wafadmin/ansiterm.py rename to third_party/waf/wafadmin/ansiterm.py index 720b79c53587..2ec0b4c96406 100644 --- a/buildtools/wafadmin/ansiterm.py +++ b/third_party/waf/wafadmin/ansiterm.py @@ -233,4 +233,3 @@ def isatty(self): sys.stderr = sys.stdout = AnsiTerm() os.environ['TERM'] = 'vt100' - diff --git a/buildtools/wafadmin/pproc.py b/third_party/waf/wafadmin/pproc.py similarity index 99% rename from buildtools/wafadmin/pproc.py rename to third_party/waf/wafadmin/pproc.py index cb15178b4eb9..44b9dd2f260c 100644 --- a/buildtools/wafadmin/pproc.py +++ b/third_party/waf/wafadmin/pproc.py @@ -617,4 +617,3 @@ def _communicate(self, input): self.wait() return (stdout, stderr) - diff --git a/buildtools/wafadmin/py3kfixes.py b/third_party/waf/wafadmin/py3kfixes.py similarity index 99% rename from buildtools/wafadmin/py3kfixes.py rename to third_party/waf/wafadmin/py3kfixes.py index 2f3c9c297765..1a647062e7b7 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') -