X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FInstallIncludes.py;h=754dfccc843306ea635689873b368a686eaa77cf;hb=5fbfcae374466c0d8d631d93e1fd58a5b7eea7d3;hp=8845fa8e0d4fe31a7a2ac4aedb155f5281cfe56b;hpb=a9fd0471a3ca128c626a6771c4518f33ef78f053;p=senf.git diff --git a/senfscons/InstallIncludes.py b/senfscons/InstallIncludes.py index 8845fa8..754dfcc 100644 --- a/senfscons/InstallIncludes.py +++ b/senfscons/InstallIncludes.py @@ -7,6 +7,11 @@ # \ingroup builder import SCons.Builder, SCons.Action, SCons.Environment, SCons.Node.FS +try: + from SCons.Tool.install import installFunc, stringFunc +except: + installFunc = SCons.Environment.installFunc + stringFunc = SCons.Environment.installString def recursiveChildren(f): rv = {} @@ -45,11 +50,11 @@ class Installer: self.source = source def __call__(self, target, source, env): - SCons.Environment.installFunc([self.target], [self.source], env) + installFunc([self.target], [self.source], env) def generator(target, source, env, for_signature): return [ SCons.Action.Action( Installer(trg, src), - SCons.Environment.installString([trg], [src], env) ) + lambda a,b,c,s=stringFunc([trg], [src], env):s ) for trg, src in zip(target,source) ] InstallIncludes = SCons.Builder.Builder(emitter = emitter,