/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 401 by johnpye, Fri Mar 31 14:22:06 2006 UTC revision 402 by johnpye, Fri Mar 31 15:46:35 2006 UTC
# Line 156  def CheckSwigVersion(context): Line 156  def CheckSwigVersion(context):
156      output = cout.read()      output = cout.read()
157      err = cerr.read()      err = cerr.read()
158      if err:      if err:
159          context.Result("Error running -version cmd:"+err)          context.Result("Error running -version cmd:\n-----\n"+err+"\n----\n")
160          return 0          return 0
161            
162      expr = re.compile("^SWIG Version (?P<maj>[0-9]+)\.(?P<min>[0-9]+)\.(?P<pat>[0-9]+)$",re.M);      expr = re.compile("^SWIG\\s+Version\\s+(?P<maj>[0-9]+)\\.(?P<min>[0-9]+)\\.(?P<pat>[0-9]+)\\s*$",re.M);
163      m = expr.search(output);      m = expr.search(output);
164      if not m:      if not m:
165          context.Result("Couldn't detect version")          context.Result("Couldn't detect version")

Legend:
Removed from v.401  
changed lines
  Added in v.402

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22