Move waf into third_party/.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 25 Mar 2015 11:13:40 +0000 (11:13 +0000)
committerJeremy Allison <jra@samba.org>
Thu, 26 Mar 2015 21:47:22 +0000 (22:47 +0100)
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
84 files changed:
buildtools/bin/waf
ctdb/wscript
lib/ldb/wscript
lib/replace/wscript
lib/talloc/wscript
lib/tdb/wscript
lib/tevent/wscript
selftest/tests.py
third_party/waf/wafadmin/3rdparty/ParallelDebug.py [moved from buildtools/wafadmin/3rdparty/ParallelDebug.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/batched_cc.py [moved from buildtools/wafadmin/3rdparty/batched_cc.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/boost.py [moved from buildtools/wafadmin/3rdparty/boost.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/build_file_tracker.py [moved from buildtools/wafadmin/3rdparty/build_file_tracker.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/fluid.py [moved from buildtools/wafadmin/3rdparty/fluid.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/gccdeps.py [moved from buildtools/wafadmin/3rdparty/gccdeps.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/go.py [moved from buildtools/wafadmin/3rdparty/go.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/lru_cache.py [moved from buildtools/wafadmin/3rdparty/lru_cache.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/paranoid.py [moved from buildtools/wafadmin/3rdparty/paranoid.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/prefork.py [moved from buildtools/wafadmin/3rdparty/prefork.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/swig.py [moved from buildtools/wafadmin/3rdparty/swig.py with 99% similarity]
third_party/waf/wafadmin/3rdparty/valadoc.py [moved from buildtools/wafadmin/3rdparty/valadoc.py with 99% similarity]
third_party/waf/wafadmin/Build.py [moved from buildtools/wafadmin/Build.py with 99% similarity]
third_party/waf/wafadmin/Configure.py [moved from buildtools/wafadmin/Configure.py with 99% similarity]
third_party/waf/wafadmin/Constants.py [moved from buildtools/wafadmin/Constants.py with 99% similarity]
third_party/waf/wafadmin/Environment.py [moved from buildtools/wafadmin/Environment.py with 99% similarity]
third_party/waf/wafadmin/Logs.py [moved from buildtools/wafadmin/Logs.py with 99% similarity]
third_party/waf/wafadmin/Node.py [moved from buildtools/wafadmin/Node.py with 99% similarity]
third_party/waf/wafadmin/Options.py [moved from buildtools/wafadmin/Options.py with 99% similarity]
third_party/waf/wafadmin/Runner.py [moved from buildtools/wafadmin/Runner.py with 99% similarity]
third_party/waf/wafadmin/Scripting.py [moved from buildtools/wafadmin/Scripting.py with 99% similarity]
third_party/waf/wafadmin/Task.py [moved from buildtools/wafadmin/Task.py with 99% similarity]
third_party/waf/wafadmin/TaskGen.py [moved from buildtools/wafadmin/TaskGen.py with 99% similarity]
third_party/waf/wafadmin/Tools/__init__.py [moved from buildtools/wafadmin/Tools/__init__.py with 98% similarity]
third_party/waf/wafadmin/Tools/ar.py [moved from buildtools/wafadmin/Tools/ar.py with 99% similarity]
third_party/waf/wafadmin/Tools/bison.py [moved from buildtools/wafadmin/Tools/bison.py with 99% similarity]
third_party/waf/wafadmin/Tools/cc.py [moved from buildtools/wafadmin/Tools/cc.py with 99% similarity]
third_party/waf/wafadmin/Tools/ccroot.py [moved from buildtools/wafadmin/Tools/ccroot.py with 99% similarity]
third_party/waf/wafadmin/Tools/compiler_cc.py [moved from buildtools/wafadmin/Tools/compiler_cc.py with 99% similarity]
third_party/waf/wafadmin/Tools/compiler_cxx.py [moved from buildtools/wafadmin/Tools/compiler_cxx.py with 99% similarity]
third_party/waf/wafadmin/Tools/compiler_d.py [moved from buildtools/wafadmin/Tools/compiler_d.py with 99% similarity]
third_party/waf/wafadmin/Tools/config_c.py [moved from buildtools/wafadmin/Tools/config_c.py with 99% similarity]
third_party/waf/wafadmin/Tools/cs.py [moved from buildtools/wafadmin/Tools/cs.py with 99% similarity]
third_party/waf/wafadmin/Tools/cxx.py [moved from buildtools/wafadmin/Tools/cxx.py with 99% similarity]
third_party/waf/wafadmin/Tools/d.py [moved from buildtools/wafadmin/Tools/d.py with 99% similarity]
third_party/waf/wafadmin/Tools/dbus.py [moved from buildtools/wafadmin/Tools/dbus.py with 99% similarity]
third_party/waf/wafadmin/Tools/dmd.py [moved from buildtools/wafadmin/Tools/dmd.py with 99% similarity]
third_party/waf/wafadmin/Tools/flex.py [moved from buildtools/wafadmin/Tools/flex.py with 99% similarity]
third_party/waf/wafadmin/Tools/gas.py [moved from buildtools/wafadmin/Tools/gas.py with 99% similarity]
third_party/waf/wafadmin/Tools/gcc.py [moved from buildtools/wafadmin/Tools/gcc.py with 99% similarity]
third_party/waf/wafadmin/Tools/gdc.py [moved from buildtools/wafadmin/Tools/gdc.py with 99% similarity]
third_party/waf/wafadmin/Tools/glib2.py [moved from buildtools/wafadmin/Tools/glib2.py with 99% similarity]
third_party/waf/wafadmin/Tools/gnome.py [moved from buildtools/wafadmin/Tools/gnome.py with 99% similarity]
third_party/waf/wafadmin/Tools/gnu_dirs.py [moved from buildtools/wafadmin/Tools/gnu_dirs.py with 99% similarity]
third_party/waf/wafadmin/Tools/gob2.py [moved from buildtools/wafadmin/Tools/gob2.py with 99% similarity]
third_party/waf/wafadmin/Tools/gxx.py [moved from buildtools/wafadmin/Tools/gxx.py with 99% similarity]
third_party/waf/wafadmin/Tools/icc.py [moved from buildtools/wafadmin/Tools/icc.py with 100% similarity]
third_party/waf/wafadmin/Tools/icpc.py [moved from buildtools/wafadmin/Tools/icpc.py with 100% similarity]
third_party/waf/wafadmin/Tools/intltool.py [moved from buildtools/wafadmin/Tools/intltool.py with 99% similarity]
third_party/waf/wafadmin/Tools/javaw.py [moved from buildtools/wafadmin/Tools/javaw.py with 99% similarity]
third_party/waf/wafadmin/Tools/kde4.py [moved from buildtools/wafadmin/Tools/kde4.py with 99% similarity]
third_party/waf/wafadmin/Tools/libtool.py [moved from buildtools/wafadmin/Tools/libtool.py with 99% similarity]
third_party/waf/wafadmin/Tools/lua.py [moved from buildtools/wafadmin/Tools/lua.py with 99% similarity]
third_party/waf/wafadmin/Tools/misc.py [moved from buildtools/wafadmin/Tools/misc.py with 99% similarity]
third_party/waf/wafadmin/Tools/msvc.py [moved from buildtools/wafadmin/Tools/msvc.py with 99% similarity]
third_party/waf/wafadmin/Tools/nasm.py [moved from buildtools/wafadmin/Tools/nasm.py with 95% similarity]
third_party/waf/wafadmin/Tools/ocaml.py [moved from buildtools/wafadmin/Tools/ocaml.py with 99% similarity]
third_party/waf/wafadmin/Tools/osx.py [moved from buildtools/wafadmin/Tools/osx.py with 99% similarity]
third_party/waf/wafadmin/Tools/perl.py [moved from buildtools/wafadmin/Tools/perl.py with 99% similarity]
third_party/waf/wafadmin/Tools/preproc.py [moved from buildtools/wafadmin/Tools/preproc.py with 99% similarity]
third_party/waf/wafadmin/Tools/python.py [moved from buildtools/wafadmin/Tools/python.py with 99% similarity]
third_party/waf/wafadmin/Tools/qt4.py [moved from buildtools/wafadmin/Tools/qt4.py with 99% similarity]
third_party/waf/wafadmin/Tools/ruby.py [moved from buildtools/wafadmin/Tools/ruby.py with 99% similarity]
third_party/waf/wafadmin/Tools/suncc.py [moved from buildtools/wafadmin/Tools/suncc.py with 100% similarity]
third_party/waf/wafadmin/Tools/suncxx.py [moved from buildtools/wafadmin/Tools/suncxx.py with 100% similarity]
third_party/waf/wafadmin/Tools/tex.py [moved from buildtools/wafadmin/Tools/tex.py with 99% similarity]
third_party/waf/wafadmin/Tools/unittestw.py [moved from buildtools/wafadmin/Tools/unittestw.py with 99% similarity]
third_party/waf/wafadmin/Tools/vala.py [moved from buildtools/wafadmin/Tools/vala.py with 99% similarity]
third_party/waf/wafadmin/Tools/winres.py [moved from buildtools/wafadmin/Tools/winres.py with 99% similarity]
third_party/waf/wafadmin/Tools/xlc.py [moved from buildtools/wafadmin/Tools/xlc.py with 100% similarity]
third_party/waf/wafadmin/Tools/xlcxx.py [moved from buildtools/wafadmin/Tools/xlcxx.py with 100% similarity]
third_party/waf/wafadmin/Utils.py [moved from buildtools/wafadmin/Utils.py with 99% similarity]
third_party/waf/wafadmin/__init__.py [moved from buildtools/wafadmin/__init__.py with 100% similarity]
third_party/waf/wafadmin/ansiterm.py [moved from buildtools/wafadmin/ansiterm.py with 99% similarity]
third_party/waf/wafadmin/pproc.py [moved from buildtools/wafadmin/pproc.py with 99% similarity]
third_party/waf/wafadmin/py3kfixes.py [moved from buildtools/wafadmin/py3kfixes.py with 99% similarity]

index db6a7d3386a137602901b9a55560b469f76d5e35..1b0f4662a56d7c44b5bb2215724d7af63a28018e 100755 (executable)
@@ -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')
index f0b68cdcc18908b3e70647293a44e4423b388108..cd0226225fbd65eb6fb1fcdb02bea7b2351b179d 100755 (executable)
@@ -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):
index 886b3e7518ce640062842d76462819523ece8919..65a684307d4b6d6ad0fc8f113b7630ea371b6253 100755 (executable)
@@ -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):
index 19494484696a3fef38397119931a770fdb3c33dc..8a203c778d49a223e381e3bf3b0a1fdb69b3d645 100644 (file)
@@ -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')
index 9efc895b5589744a71390f48ee5e5b8f9aa866c8..a1b72a076137ac933f162b4b5f7f7b66d7707b8e 100644 (file)
@@ -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):
index b283795870b7959198308ba330bc72a98388fc5b..fdc5d2fd37ca13ffe284ca88e371a38502726f6b 100644 (file)
@@ -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',
index 0da82326bccbdb1ace54984e29b16e0dd03747e2..026cd9a1c1b4f996eb46875d40a923de94c960b2 100755 (executable)
@@ -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')
index cceb6e4f4715650f80a4f6c9d4bf7b85d81df6d2..1185142afc5340f5a255e46dd60a4dc3e3ceb8dd 100644 (file)
@@ -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"),
similarity index 99%
rename from buildtools/wafadmin/3rdparty/ParallelDebug.py
rename to third_party/waf/wafadmin/3rdparty/ParallelDebug.py
index 9d0493e5e172f8d0dfb4f493cccaa19f14af6087..0ff580ece27c15e179a8c9e4bf751e39585b3ba6 100644 (file)
@@ -295,5 +295,3 @@ function hideInfo(evt) {
        #node = producer.bld.path.make_node('pdebug.svg')
        f = open('pdebug.svg', 'w')
        f.write("".join(out))
-
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/batched_cc.py
rename to third_party/waf/wafadmin/3rdparty/batched_cc.py
index 8e310745c633861db9c1c527cd741ce754d74e87..7ed569ccb709c4302650f53c45c1f55ec0b0cc83 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/boost.py
rename to third_party/waf/wafadmin/3rdparty/boost.py
index e690a4e2740f0714d67bca0822f5b26d39abf5a9..1cbbf7e850dc9a64bf29b2201431f8bd993f3d83 100644 (file)
@@ -340,4 +340,3 @@ def check_boost(self, *k, **kw):
                                self.check_message_2(kw['okmsg'])
 
        return ret
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/build_file_tracker.py
rename to third_party/waf/wafadmin/3rdparty/build_file_tracker.py
index 9c48928fc02eaafaa92bdf58408137b0f5300962..5fc73581ec25fb4b6fb65ca41d62fb3b1ce7318d 100644 (file)
@@ -51,4 +51,3 @@ def signature(self):
 
 Task.Task.signature_bak = Task.Task.signature # unused, kept just in case
 Task.Task.signature = signature # overridden
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/fluid.py
rename to third_party/waf/wafadmin/3rdparty/fluid.py
index 117edef7200b62ceb450de51498a9d4a92f348b7..c858fe311cbea7c35cfd68c6d032f5dca09e996c 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/gccdeps.py
rename to third_party/waf/wafadmin/3rdparty/gccdeps.py
index 6600c9ca3ba563fde3d28061541606e1ab797905..28a889d78b63f400d453de878cde1b7ccf7b8c99 100644 (file)
@@ -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
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/go.py
rename to third_party/waf/wafadmin/3rdparty/go.py
index 2d8df0d2b64eba1ea4d14c88830b7da32a599711..f8397c7e1c7fc04ecaddcb79a8b7b544df768676 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/lru_cache.py
rename to third_party/waf/wafadmin/3rdparty/lru_cache.py
index 5b00abc29bebcff5d07639c0e38c8b7791ba5a46..96f0e6cf10937da30a5257ae5f04f96a0defd446 100644 (file)
@@ -94,4 +94,3 @@ def sweep(self):
 Build.BuildContext.raw_compile = Build.BuildContext.compile
 Build.BuildContext.compile = compile
 Build.BuildContext.sweep = sweep
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/paranoid.py
rename to third_party/waf/wafadmin/3rdparty/paranoid.py
index ead64ea5c3aa80b0c04001aeca1adc8e49151382..ba6d752894949d3c1e7485f126ce219e77023ec5 100644 (file)
@@ -32,4 +32,3 @@ def compile(self):
                check_task_classes(self)
        return comp(self)
 Build.BuildContext.compile = compile
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/prefork.py
rename to third_party/waf/wafadmin/3rdparty/prefork.py
index 1c760c27bbadf25dc2212f88fe01c3f3c57d1075..88fb4e406193476f8bb8658fd8a108baed7ecaad 100755 (executable)
@@ -273,4 +273,3 @@ else:
        def build(bld):
                # dangerous, there is no other command hopefully
                Utils.exec_command = exec_command
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/swig.py
rename to third_party/waf/wafadmin/3rdparty/swig.py
index c0a4108700e72b6e082f166d7dbdf4442b3576db..393e8e190a09e2e81cc3dc7adc07fa21947fdd4b 100644 (file)
@@ -187,4 +187,3 @@ def check_swig_version(conf, minver=None):
 
 def detect(conf):
        swig = conf.find_program('swig', var='SWIG', mandatory=True)
-
similarity index 99%
rename from buildtools/wafadmin/3rdparty/valadoc.py
rename to third_party/waf/wafadmin/3rdparty/valadoc.py
index d0a9fe80ed64efac9d08773b47a1b2c21e67099b..bdb0c6bd5b8f2f6c954456ad9e45fe494350d37c 100644 (file)
@@ -110,4 +110,3 @@ def process_valadoc(self):
 
 def detect(conf):
   conf.find_program('valadoc', var='VALADOC', mandatory=False)
-
similarity index 99%
rename from buildtools/wafadmin/Build.py
rename to third_party/waf/wafadmin/Build.py
index 8e7c72c4ed709f0e2c0a41e785610a418a4b67bd..50f4d7f6c69e949ddb7a89b4760063d90aea4b0e 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Configure.py
rename to third_party/waf/wafadmin/Configure.py
index 35b4e51ec35a09721fbcf32e086e475022272e9f..7575cefd0e194fee795d0a1720c17fcf62c829b2 100644 (file)
@@ -440,5 +440,3 @@ def conftest(f):
        "decorator: attach new configuration tests (registered as strings)"
        ConfigurationContext.tests[f.__name__] = f
        return conf(f)
-
-
similarity index 99%
rename from buildtools/wafadmin/Constants.py
rename to third_party/waf/wafadmin/Constants.py
index e67dda6ecd8c235cf5ae782fd696d9dca3ccf5ec..30960b978d1b584214cbc7cdb5fa4eda915e536f 100644 (file)
@@ -73,4 +73,3 @@ CFG_FILES = 'cfg_files'
 # negative '<-' uninstall
 INSTALL = 1337
 UNINSTALL = -1337
-
similarity index 99%
rename from buildtools/wafadmin/Environment.py
rename to third_party/waf/wafadmin/Environment.py
index 52c83b4f3e45b543563e5777b0d3c38a706ffe98..bea4146516568e51ce2e91bb934141ae558f6935 100644 (file)
@@ -207,4 +207,3 @@ class Environment(object):
                        object.__delattr__(self, name)
                else:
                        del self[name]
-
similarity index 99%
rename from buildtools/wafadmin/Logs.py
rename to third_party/waf/wafadmin/Logs.py
index c160b3773664aa8b06db9a5a351d852a41b50ada..f67e87c721281910bb1f3a5049fd724a9b9e07da 100644 (file)
@@ -131,4 +131,3 @@ def init_log():
 
 # may be initialized more than once
 init_log()
-
similarity index 99%
rename from buildtools/wafadmin/Node.py
rename to third_party/waf/wafadmin/Node.py
index 4fa205c96becd472709380a802937d9e7c929d51..158a4a4d47010d3e2f32fe759d678c028f4234df 100644 (file)
@@ -692,4 +692,3 @@ class Node(object):
 
 class Nodu(Node):
        pass
-
similarity index 99%
rename from buildtools/wafadmin/Options.py
rename to third_party/waf/wafadmin/Options.py
index c9ddcfe650314edb38d4aef6cb1b60d4ca1dc7b3..7e87c110902842269e3e063d1c8c3031e88a33c8 100644 (file)
@@ -285,4 +285,3 @@ class Handler(Utils.Context):
 
        def parse_args(self, args=None):
                parse_args_impl(self.parser, args)
-
similarity index 99%
rename from buildtools/wafadmin/Runner.py
rename to third_party/waf/wafadmin/Runner.py
index 94db0fbd1ba4d5f0879ef27da6f7250f36b400b6..0d2dea5ef47c5fc926891d8ea63c9e42e527fc51 100644 (file)
@@ -233,4 +233,3 @@ class Parallel(object):
 
                #print loop
                assert (self.count == 0 or self.stop)
-
similarity index 99%
rename from buildtools/wafadmin/Scripting.py
rename to third_party/waf/wafadmin/Scripting.py
index d975bd934d13c793a2efe2c38941d511226c64d7..6f6110487db9279d871cefba625c3b72fb21ad22 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Task.py
rename to third_party/waf/wafadmin/Task.py
index 5cda2ec7301f592f3b5afa0c593eb2f9118077a5..59d10203a496d157f3c8c97b11c1185040d359e6 100644 (file)
@@ -1197,4 +1197,3 @@ def extract_deps(tasks):
                        delattr(x, 'cache_sig')
                except AttributeError:
                        pass
-
similarity index 99%
rename from buildtools/wafadmin/TaskGen.py
rename to third_party/waf/wafadmin/TaskGen.py
index 52d0236c850966c96fbeff89870ad022746c1a5a..5900809ddfed4692fd8e61bb7b9df03ec7a665c9 100644 (file)
@@ -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)
-
similarity index 98%
rename from buildtools/wafadmin/Tools/__init__.py
rename to third_party/waf/wafadmin/Tools/__init__.py
index bc6ca230b5e9fb455e21ce0b19f0e3456ed26694..8f026e187ff6e3a2d9d3bf02bc34329a510767f5 100644 (file)
@@ -1,4 +1,3 @@
 #!/usr/bin/env python
 # encoding: utf-8
 # Thomas Nagy, 2006 (ita)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/ar.py
rename to third_party/waf/wafadmin/Tools/ar.py
index af9b17fd6e99e2a9ea2a2c84c07ce08bef2d902f..3571670d5b50ecd4e18381ff03e1f95a557ec842 100644 (file)
@@ -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')
-
-
similarity index 99%
rename from buildtools/wafadmin/Tools/bison.py
rename to third_party/waf/wafadmin/Tools/bison.py
index 49c605187336c254e740eca143a0fe3bafd1341e..c281e61ddaffc86e154aa8b0f7730ac4e47c0f63 100644 (file)
@@ -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'
-
similarity index 99%
rename from buildtools/wafadmin/Tools/cc.py
rename to third_party/waf/wafadmin/Tools/cc.py
index 903a1c5038c80499c5bef7d969c8696856e995c3..e54df4715e5d80d0600887b08ae52c6f94898b96 100644 (file)
@@ -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
-
similarity index 99%
rename from buildtools/wafadmin/Tools/ccroot.py
rename to third_party/waf/wafadmin/Tools/ccroot.py
index 25c5179be0e08581c75024fafcaff0a71d22a724..c130b40a21dc52b6c3a8063f3f3f0e3f7aef11f9 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/compiler_cc.py
rename to third_party/waf/wafadmin/Tools/compiler_cc.py
index 0421503f7c932ba65b6b10c39c0ffb647a40c619..642458aba61344451201c9dc629a4271bb1bfb89 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/compiler_cxx.py
rename to third_party/waf/wafadmin/Tools/compiler_cxx.py
index 5308ea97199e04f028d380157d8217b0ab29ac10..aa0b0e7d460a3ab8d2dda8aa770218d83bd3b624 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/compiler_d.py
rename to third_party/waf/wafadmin/Tools/compiler_d.py
index 1ea5efa30e8b4ba7cd24b4bd1352724db246ba16..378277a25aaa8de6d3f7816e8c56ac17e7f3a825 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/config_c.py
rename to third_party/waf/wafadmin/Tools/config_c.py
index d0bc61773625576cec1d0b1eec2635086d04c2e7..9f1103cb27d58e8b0cd3cf6aca345bbec990b6e8 100644 (file)
@@ -746,4 +746,3 @@ def cc_load_tools(conf):
 @conftest
 def cxx_load_tools(conf):
        conf.check_tool('cxx')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/cs.py
rename to third_party/waf/wafadmin/Tools/cs.py
index 43544856f34045ede3b6c3f4680d87b0d5c94794..4c987d2a875f846d24032020293222e4152eef1c 100644 (file)
@@ -65,4 +65,3 @@ def detect(conf):
 
 def set_options(opt):
        opt.add_option('--with-csc-binary', type='string', dest='cscbinary')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/cxx.py
rename to third_party/waf/wafadmin/Tools/cxx.py
index 719b82177c15e189ae15afde994e5cc38fda6bcf..184fee3e0654a5195ddadd7e76a1fa686ed6ef41 100644 (file)
@@ -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
-
similarity index 99%
rename from buildtools/wafadmin/Tools/d.py
rename to third_party/waf/wafadmin/Tools/d.py
index 1a22821bc5561511ff59fe2e4c49705b6aaf2f24..2c2e94857e36a52fd619a6415b62392f6147dd8e 100644 (file)
@@ -532,4 +532,3 @@ if __name__ == "__main__":
                print imp + " ",
        print
 """
-
similarity index 99%
rename from buildtools/wafadmin/Tools/dbus.py
rename to third_party/waf/wafadmin/Tools/dbus.py
index 317999939213f08ce61428cf8424c875fe77c890..42c4ca2cb7fb29d64de074911b67aa873c7cf479 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/dmd.py
rename to third_party/waf/wafadmin/Tools/dmd.py
index 9c7490844db04328b81d34cc72c921f8a25c4758..b86ffd6a0f41c502d6128995319eb53c4122abad 100644 (file)
@@ -61,4 +61,3 @@ def detect(conf):
 
        if conf.env.D_COMPILER.find('ldc') > -1:
                conf.common_flags_ldc()
-
similarity index 99%
rename from buildtools/wafadmin/Tools/flex.py
rename to third_party/waf/wafadmin/Tools/flex.py
index 5ce9f2210e380b01ca56a7aa5271e31c03edd672..cbea42db2c94170628a6713e9499722170bf4b28 100644 (file)
@@ -22,4 +22,3 @@ TaskGen.declare_chain(
 def detect(conf):
        conf.find_program('flex', var='FLEX', mandatory=True)
        conf.env['FLEXFLAGS'] = ''
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gas.py
rename to third_party/waf/wafadmin/Tools/gas.py
index c983b0a39591c2e2c35384726729e93aad2494f5..5dd0b5d746077b6aa9daaaa17f251a63e361d5f4 100644 (file)
@@ -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
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gcc.py
rename to third_party/waf/wafadmin/Tools/gcc.py
index a6be0b28dbf133097d69798d5bc7eefc92af4c16..83d5b248ad9ff091533b64ad494784e4c439503b 100644 (file)
@@ -136,4 +136,3 @@ def detect(conf):
        conf.cc_load_tools()
        conf.cc_add_flags()
        conf.link_add_flags()
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gdc.py
rename to third_party/waf/wafadmin/Tools/gdc.py
index 4d2a3216edd5a11cb9830a67b593968d0f82b6cb..d1e5e7b53cb720ca2c429ac730bf5af6498684a4 100644 (file)
@@ -49,4 +49,3 @@ def detect(conf):
        conf.check_tool('d')
        conf.common_flags_gdc()
        conf.d_platform_flags()
-
similarity index 99%
rename from buildtools/wafadmin/Tools/glib2.py
rename to third_party/waf/wafadmin/Tools/glib2.py
index 042d612cbe48cf66c7cf0df86cdfe69b8a2d0e5e..d3fc7769740967ca0c79eaf8a36e1bac76d88548 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gnome.py
rename to third_party/waf/wafadmin/Tools/gnome.py
index c098a41bb4b60d9ee9d335fec3e9f2576e8ea32c..da11e91d3d87a320584869c25929ec8ba18cc6c2 100644 (file)
@@ -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]')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gnu_dirs.py
rename to third_party/waf/wafadmin/Tools/gnu_dirs.py
index 856e4a7204b54421b5346131c376bfe7dbd53a51..ac149dfa46b8a124e151c2494bd47e6a4b35c15b 100644 (file)
@@ -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())
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gob2.py
rename to third_party/waf/wafadmin/Tools/gob2.py
index 00aaa32acda1a1da0e91850944f4242de8e6acd0..96d8e2030ca959be7b783bede30b359d8862f291 100644 (file)
@@ -15,4 +15,3 @@ def detect(conf):
        gob2 = conf.find_program('gob2', var='GOB2', mandatory=True)
        conf.env['GOB2'] = gob2
        conf.env['GOB2FLAGS'] = ''
-
similarity index 99%
rename from buildtools/wafadmin/Tools/gxx.py
rename to third_party/waf/wafadmin/Tools/gxx.py
index 4984122e5e6239cb2e462fbca06dd710f134432c..38e8d00ae5b4a4ed4b58c36bc7d2d8cd0eaa57c7 100644 (file)
@@ -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()
-
similarity index 99%
rename from buildtools/wafadmin/Tools/intltool.py
rename to third_party/waf/wafadmin/Tools/intltool.py
index deb8f4a634149cec3a50799f3674cf376d69dab9..5fb3df2cbbb89ddd7d93dc24d103fa9a4356ab24 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/javaw.py
rename to third_party/waf/wafadmin/Tools/javaw.py
index 301ebc426b9d23a1b62b31c11042225ce2d1fbe3..4d9f4c77907c0136fa4e1280a9c2c7388c69cc89 100644 (file)
@@ -252,4 +252,3 @@ def check_jni_headers(conf):
                        break
        else:
                conf.fatal('could not find lib jvm in %r (see config.log)' % libDirs)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/kde4.py
rename to third_party/waf/wafadmin/Tools/kde4.py
index f480929da653d11a5d9c1efca8d8296094af3ae0..1f3bae783d38cd6cacb570548d40965c818f5cc8 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/libtool.py
rename to third_party/waf/wafadmin/Tools/libtool.py
index 47fa906fcccb2ca2d0decc72a80cebd77681e883..bcc0e2f318d13b2da6de7206333bc689ef241852 100644 (file)
@@ -327,4 +327,3 @@ nor: %prog --libs /usr/lib/libamarok.la'''
 
 if __name__ == '__main__':
        useCmdLine()
-
similarity index 99%
rename from buildtools/wafadmin/Tools/lua.py
rename to third_party/waf/wafadmin/Tools/lua.py
index 5b181e1310fbc065aa40fdb6e24aec2f8d756e4e..8a6c1f46e796ca4f71e0f053f7a2666ea9339e6b 100644 (file)
@@ -22,4 +22,3 @@ def init_lua(self):
 
 def detect(conf):
        conf.find_program('luac', var='LUAC', mandatory = True)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/misc.py
rename to third_party/waf/wafadmin/Tools/misc.py
index 9903ee4bd3cad59e05f75ae5548b1d0b5622ef7e..6ef45aef444b74096442a8f086ea45fb247a2a0f 100644 (file)
@@ -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
-
similarity index 99%
rename from buildtools/wafadmin/Tools/msvc.py
rename to third_party/waf/wafadmin/Tools/msvc.py
index 4fde8b14687999cc6d49d232d4f99626408417f5..2a97d19a7ebca93a9529575594470f29db677c29 100644 (file)
@@ -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
-
similarity index 95%
rename from buildtools/wafadmin/Tools/nasm.py
rename to third_party/waf/wafadmin/Tools/nasm.py
index b99c3c7340460f51433c2aa982b4ac8827213a46..43b73a7e4839a13887f90bc5bb0ec46e751c3fb7 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/ocaml.py
rename to third_party/waf/wafadmin/Tools/ocaml.py
index 20c926969a129b61604a45d16d09fbe2f8560309..a0667a4d257e55fdbef012bb8a560859aef9d21e 100644 (file)
@@ -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'
-
similarity index 99%
rename from buildtools/wafadmin/Tools/osx.py
rename to third_party/waf/wafadmin/Tools/osx.py
index 561eca487dedf329513d59d8a95b780f5874bc8f..88ca0d950aa9d672c53864cdefad81516076e048 100644 (file)
@@ -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")
-
similarity index 99%
rename from buildtools/wafadmin/Tools/perl.py
rename to third_party/waf/wafadmin/Tools/perl.py
index a6787a86ecfa86d41593fb01c561e145d6825738..85105ead88fd9f5863fa442aa6397a1acfd59207 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/preproc.py
rename to third_party/waf/wafadmin/Tools/preproc.py
index 6c49326ec3e5945137972c5fab97226291e1118c..71eb05ae09292e7acdf9decad758d679d84e5130 100644 (file)
@@ -835,5 +835,3 @@ def get_deps_simple(node, env, nodepaths=[], defines={}):
 
        find_deps(node)
        return (nodes, names)
-
-
similarity index 99%
rename from buildtools/wafadmin/Tools/python.py
rename to third_party/waf/wafadmin/Tools/python.py
index 35c61c24664ecac5522b937c33c75e3d14038660..cfc8495e91924626c29a9c5c5e2a8b3fe999107a 100644 (file)
@@ -426,4 +426,3 @@ def set_options(opt):
                        default=1,
                        help='Do not install optimised compiled .pyo files (configuration) [Default:install]',
                        dest='pyo')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/qt4.py
rename to third_party/waf/wafadmin/Tools/qt4.py
index 84d121a844f16439ed8c691c01e851efe371323c..7d2cad7d9c1836e66de716ace0307bbcc548e0bc 100644 (file)
@@ -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)
-
similarity index 99%
rename from buildtools/wafadmin/Tools/ruby.py
rename to third_party/waf/wafadmin/Tools/ruby.py
index d3b75695aeccd791daebd6497c3f20634c162678..afa8a596b0d8864984ca143b84ef7581f0239f9a 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/tex.py
rename to third_party/waf/wafadmin/Tools/tex.py
index 700c54fc6e4ffd50dec58f3e95824e9383e72450..43aee1f42714ddfdcfb00ad8520f310fda8cffdd 100644 (file)
@@ -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
-
similarity index 99%
rename from buildtools/wafadmin/Tools/unittestw.py
rename to third_party/waf/wafadmin/Tools/unittestw.py
index 0e30a510fb54cfa16d1ef11c203308f8a74bf2f3..7cf2ded9918167ee51fafb0d5fa0e645d82920b4 100644 (file)
@@ -306,5 +306,3 @@ def summary(bld):
                for (f, code, out, err) in lst:
                        if code:
                                Utils.pprint('CYAN', '    %s' % f)
-
-
similarity index 99%
rename from buildtools/wafadmin/Tools/vala.py
rename to third_party/waf/wafadmin/Tools/vala.py
index 753ee8d94e283aa36cbf71d70f72aaebad532630..df1d11bb83932fc0679c8410ca0e5fac9680b804 100644 (file)
@@ -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')
-
similarity index 99%
rename from buildtools/wafadmin/Tools/winres.py
rename to third_party/waf/wafadmin/Tools/winres.py
index 2500d431de9000edf1ca53c8ad7ffcfa48b276f2..6b5aad004cc4522347a48d7e10dbdc8a16d39fa4 100644 (file)
@@ -42,4 +42,3 @@ def detect(conf):
                conf.fatal('winrc was not found!')
 
        v['WINRCFLAGS'] = ''
-
similarity index 99%
rename from buildtools/wafadmin/Utils.py
rename to third_party/waf/wafadmin/Utils.py
index cff6719261d37bce390a57bf71cd0b37c0db944d..5a59a4c30a360951ef99924317f28a0a5ded86d6 100644 (file)
@@ -723,4 +723,3 @@ def run_once(fun):
                        return ret
        wrap.__cache__ = cache
        return wrap
-
similarity index 99%
rename from buildtools/wafadmin/ansiterm.py
rename to third_party/waf/wafadmin/ansiterm.py
index 720b79c53587f785a34329c0bd72c6072875cea4..2ec0b4c964061296e76167baa21004a4035deb9e 100644 (file)
@@ -233,4 +233,3 @@ else:
 
        sys.stderr = sys.stdout = AnsiTerm()
        os.environ['TERM'] = 'vt100'
-
similarity index 99%
rename from buildtools/wafadmin/pproc.py
rename to third_party/waf/wafadmin/pproc.py
index cb15178b4eb92737cfc24fb7866da20778e6956e..44b9dd2f260c58565a105a5e16f9542759b0afeb 100644 (file)
@@ -617,4 +617,3 @@ class Popen(object):
 
             self.wait()
             return (stdout, stderr)
-
similarity index 99%
rename from buildtools/wafadmin/py3kfixes.py
rename to third_party/waf/wafadmin/py3kfixes.py
index 2f3c9c29776548171dd2eae6a16ffb0e6a79e0e8..1a647062e7b7138a4aa47fc1a0a6c4985ea81014 100644 (file)
@@ -127,4 +127,3 @@ def fixdir(dir):
                for v in all_modifs[k]:
                        modif(os.path.join(dir, 'wafadmin'), k, v)
        #print('substitutions finished')
-