X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsenfutil.py;h=1cb88e352a909fd82a2ad1ca15e6f6d63c6b2e74;hb=8715a32e62efafee5a9681f3f3ee8d18c4bf2859;hp=25e124915fd04afffd5e7bb6cbfc257f207e5798;hpb=c96297689340465d5f1cb4c677eccea8abdbfc42;p=senf.git diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py index 25e1249..1cb88e3 100644 --- a/site_scons/senfutil.py +++ b/site_scons/senfutil.py @@ -1,6 +1,13 @@ import os.path from SCons.Script import * +# Fix for SCons 0.97 compatibility +try: + Variables +except NameError: + Variables = Options + BoolVariable = BoolOption + def parseLogOption(value): stream, area, level = ( x.strip() for x in value.strip().split('|') ) stream = ''.join('(%s)' % x for x in stream.split('::') ) @@ -24,7 +31,7 @@ class BuildTypeOptions: def parseArguments(env, *defs): vars = Variables(args=ARGUMENTS) - vars.AddVariables(*defs) + for d in defs : vars.Add(d) vars.Update(env) env.Help(""" Any construction environment variable may be set from the scons @@ -37,7 +44,9 @@ of variables) using Special command line parameters: """) env.Help(vars.GenerateHelpText(env)) - for k,v in vars.UnknownVariables().iteritems(): + try : unknv = vars.UnknownVariables() + except AttributeError: unknv = vars.UnknownOptions() + for k,v in unknv.iteritems(): if k.endswith('+'): env.Append(**{k[:-1]: v}) else: