/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2094 by jpye, Sat Nov 28 02:26:22 2009 UTC revision 2129 by jpye, Fri Dec 18 01:09:28 2009 UTC
# Line 11  soname_major = ".1" Line 11  soname_major = ".1"
11  soname_minor = ".0"  soname_minor = ".0"
12    
13  import sys, os, commands, platform, distutils.sysconfig, os.path, re, types  import sys, os, commands, platform, distutils.sysconfig, os.path, re, types
14    import subprocess
15    
16  # version number for python, useful on Windows  # version number for python, useful on Windows
17  pyversion = "%d.%d" % (sys.version_info[0],sys.version_info[1])  pyversion = "%d.%d" % (sys.version_info[0],sys.version_info[1])
# Line 1126  def CheckF77(context): Line 1127  def CheckF77(context):
1127  import os,re  import os,re
1128    
1129  def get_swig_version(env):  def get_swig_version(env):
1130      cmd = env['SWIG']+' -version'      cmd = [env['SWIG'],'-version']
1131      (cin,coutcerr) = os.popen4(cmd)      p = subprocess.Popen(cmd,stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,close_fds=True)
1132      output = coutcerr.read()  
1133        output = p.stdout.read()
1134            
1135      restr = "SWIG\\s+Version\\s+(?P<maj>[0-9]+)\\.(?P<min>[0-9]+)\\.(?P<pat>[0-9]+)\\s*$"      restr = "SWIG\\s+Version\\s+(?P<maj>[0-9]+)\\.(?P<min>[0-9]+)\\.(?P<pat>[0-9]+)\\s*$"
1136      expr = re.compile(restr,re.M);      expr = re.compile(restr,re.M);
# Line 1171  def CheckSwigVersion(context): Line 1173  def CheckSwigVersion(context):
1173  # Scrollkeeper (Linux documentation system)  # Scrollkeeper (Linux documentation system)
1174    
1175  def get_scrollkeeper_omfdir(env):  def get_scrollkeeper_omfdir(env):
1176      cmd = 'scrollkeeper-config --omfdir'      cmd = ['scrollkeeper-config','--omfdir']
1177      (cin,coutcerr) = os.popen4(cmd)      p = subprocess.Popen(cmd,stdout=subprocess.PIPE,close_fds=True)
1178      output = coutcerr.read()      return p.coutcerr.read().strip()
     return output.strip()  
1179    
1180  def CheckScrollkeeperConfig(context):  def CheckScrollkeeperConfig(context):
1181      try:      try:

Legend:
Removed from v.2094  
changed lines
  Added in v.2129

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