/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

temp_trunk_copy/SConstruct revision 1384 by phornby, Fri Jan 11 02:29:38 2008 UTC trunk/SConstruct revision 1416 by ksteube, Mon Feb 25 03:56:17 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 452  except KeyError: Line 453  except KeyError:
453     useMPI = None     useMPI = None
454  # ========= set compiler flags ===========================================  # ========= set compiler flags ===========================================
455    
 # Can't use MPI and OpenMP simultaneously at this time  
 if useMPI:  
     omp_flags=''  
     omp_flags_debug=''  
   
456  if dodebug:  if dodebug:
457      try:      try:
458        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
# Line 851  try: Line 847  try:
847     global_revision = re.sub(":.*", "", global_revision[0])     global_revision = re.sub(":.*", "", global_revision[0])
848     global_revision = re.sub("[^0-9]", "", global_revision)     global_revision = re.sub("[^0-9]", "", global_revision)
849  except:  except:
850     global_revision = "0"     global_revision="-1"
851       print "Warning: unable to recover global revsion number."
852    if global_revision == "": global_revision="0"
853    print "Revision number is %s."%global_revision
854  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
855    
856  # Python install - esys __init__.py  # Python install - esys __init__.py

Legend:
Removed from v.1384  
changed lines
  Added in v.1416

  ViewVC Help
Powered by ViewVC 1.1.26