summaryrefslogtreecommitdiffstats
path: root/waftools
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-11 20:35:10 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-11 20:54:42 +0200
commitd906d091627a9be8d0d1e13f54d737eca6dc16ff (patch)
treee97066921e8901c5c531dda05adb01d0b9d3cb2d /waftools
parent227e470ee213b6618c080ae654cc947b4adb0add (diff)
downloadmpv-d906d091627a9be8d0d1e13f54d737eca6dc16ff.tar.bz2
mpv-d906d091627a9be8d0d1e13f54d737eca6dc16ff.tar.xz
build: update waf to version 1.8.1
Fixes #1164
Diffstat (limited to 'waftools')
-rw-r--r--waftools/generators/headers.py2
-rw-r--r--waftools/waf_customizations.py20
2 files changed, 4 insertions, 18 deletions
diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py
index bd28befd99..79bd71d0f0 100644
--- a/waftools/generators/headers.py
+++ b/waftools/generators/headers.py
@@ -1,5 +1,5 @@
def __cp_to_variant__(ctx, variant, basename):
- src = ctx.bldnode.search(basename).read()
+ src = ctx.bldnode.search_node(basename).read()
node = ctx.bldnode.make_node("{0}/{1}".format(variant, basename))
node.parent.mkdir()
node.write(src)
diff --git a/waftools/waf_customizations.py b/waftools/waf_customizations.py
index 8da68c9a84..61140cf22b 100644
--- a/waftools/waf_customizations.py
+++ b/waftools/waf_customizations.py
@@ -30,28 +30,14 @@ def m_hook(self, node):
def build(ctx):
from waflib import Task
- import syms
+
+ def nice_path(node):
+ return node.path_from(node.ctx.launch_node())
cls = Task.classes['cprogram']
class cprogram(cls):
run_str = cls.hcode + '${LAST_LINKFLAGS}'
- def __str__(self):
- tgt_str = ' '.join([a.nice_path() for a in self.outputs])
- return 'linking -> {0}\n'.format(tgt_str)
-
- cls = Task.classes['cshlib']
- class cshlib(cls):
- def __str__(self):
- tgt_str = ' '.join([a.nice_path() for a in self.outputs])
- return 'linking -> {0}\n'.format(tgt_str)
-
- cls = Task.classes['compile_sym']
- class compile_sym(cls):
- def __str__(self):
- tgt_str = ' '.join([a.nice_path() for a in self.outputs])
- return 'compile_sym -> {0}\n'.format(tgt_str)
-
cls = Task.classes['macplist']
class macplist(cls):
def run(self):