/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1389 by gross, Mon Jan 14 03:31:57 2008 UTC revision 1428 by trankine, Wed Feb 27 08:07:11 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  #   import tools:  #   import tools:
17  import glob  import glob
# Line 292  opts.AddOptions( Line 291  opts.AddOptions(
291    
292  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
293        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
294          #env = Environment(tools = ['default', 'intelc'], options = opts)
295  else:  else:
296     if os.uname()[4]=='ia64':     if os.uname()[4]=='ia64':
297        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
# Line 453  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 845  try: Line 840  try:
840  except KeyError:  except KeyError:
841     api_doxygen = None     api_doxygen = None
842    
 global_revision="$Revison"  
843  try:  try:
844     svn_pipe = os.popen("svnversion -n .")     svn_pipe = os.popen("svnversion -n .")
845     global_revision = svn_pipe.readlines()     global_revision = svn_pipe.readlines()
846     svn_pipe.close()     svn_pipe.close()
847       global_revision = re.sub(":.*", "", global_revision[0])
848       global_revision = re.sub("[^0-9]", "", global_revision)
849  except:  except:
850     print "Extracting revision number failed. Using %s instead."%global_revision     global_revision="-1"
851  global_revision = re.sub(":.*", "", global_revision[0])     print "Warning: unable to recover global revsion number."
852  global_revision = re.sub("[^0-9]", "", global_revision)  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.1389  
changed lines
  Added in v.1428

  ViewVC Help
Powered by ViewVC 1.1.26