/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1374 by gross, Tue Jan 8 09:37:55 2008 UTC revision 1391 by gross, Mon Jan 14 03:54:57 2008 UTC
# Line 12  Line 12 
12  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
13  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
14    
15    
16  #===============================================================  #===============================================================
17  #   import tools:  #   import tools:
18  import glob  import glob
# Line 31  tools_prefix="/usr" Line 32  tools_prefix="/usr"
32  #      #    
33  #    get the installation prefix  #    get the installation prefix
34  #  #
35  prefix = ARGUMENTS.get('prefix', '/usr')  prefix = ARGUMENTS.get('prefix', sys.prefix )
36    
37  # We may also need to know where python's site-packages subdirectory lives  # We may also need to know where python's site-packages subdirectory lives
38  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
# Line 851  try: Line 852  try:
852     global_revision = re.sub(":.*", "", global_revision[0])     global_revision = re.sub(":.*", "", global_revision[0])
853     global_revision = re.sub("[^0-9]", "", global_revision)     global_revision = re.sub("[^0-9]", "", global_revision)
854  except:  except:
855     global_revision = "0"     global_revision="-1"
856       print "Warning: unable to recover global revsion number."
857    print "Revision number is %s."%global_revision
858  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
859    
860  # Python install - esys __init__.py  # Python install - esys __init__.py
Legend:
Removed from v.1374  
changed lines
  Added in v.1391
  ViewVC Help
Powered by ViewVC 1.1.26