/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1360 by ksteube, Thu Dec 13 05:05:00 2007 UTC revision 1389 by gross, Mon Jan 14 03:31: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 20  import sys, os, re Line 21  import sys, os, re
21  if sys.path.count('scons')==0: sys.path.append('scons')  if sys.path.count('scons')==0: sys.path.append('scons')
22  import scons_extensions  import scons_extensions
23    
24    # We may also need to know where python's site-packages subdirectory lives
25    python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
26    
27  #===============================================================  #===============================================================
28    
29  tools_prefix="/usr"  tools_prefix="/usr"
# Line 28  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])
   
39  # Install as a standard python package in /usr/lib64 if available, else in /usr/lib  # Install as a standard python package in /usr/lib64 if available, else in /usr/lib
40  if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):  if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):
41     sys_dir_packages =  prefix+"/lib64/"+python_version+"/site-packages/esys"     sys_dir_packages =  prefix+"/lib64/"+python_version+"/site-packages/esys"
# Line 349  except KeyError: Line 352  except KeyError:
352    
353  try:  try:
354     tmp = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
355       print tmp
356     env['ENV']['LD_LIBRARY_PATH'] = tmp     env['ENV']['LD_LIBRARY_PATH'] = tmp
357  except KeyError:  except KeyError:
358     pass     pass
# Line 502  if not useMPI: Line 506  if not useMPI:
506     try:     try:
507        lib_path = env['mkl_lib_path']        lib_path = env['mkl_lib_path']
508        env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
509          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
510     except KeyError:     except KeyError:
511        pass        pass
512    
# Line 523  if not useMPI: Line 528  if not useMPI:
528     try:     try:
529        lib_path = env['scsl_lib_path']        lib_path = env['scsl_lib_path']
530        env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
531          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
532     except KeyError:     except KeyError:
533        pass        pass
534        
# Line 664  if useNetCDF == 'yes': Line 670  if useNetCDF == 'yes':
670     try:     try:
671        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
672        env.Append(LIBPATH = [ lib_path, ])        env.Append(LIBPATH = [ lib_path, ])
673          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
674        if IS_WINDOWS_PLATFORM :        if IS_WINDOWS_PLATFORM :
675           env.PrependENVPath('PATH', lib_path)           env.PrependENVPath('PATH', lib_path)
676     except KeyError:     except KeyError:
# Line 681  except KeyError: Line 688  except KeyError:
688  try:  try:
689     lib_path = env['boost_lib_path']     lib_path = env['boost_lib_path']
690     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
691       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
692     if IS_WINDOWS_PLATFORM :     if IS_WINDOWS_PLATFORM :
693        env.PrependENVPath('PATH', lib_path)        env.PrependENVPath('PATH', lib_path)
694  except KeyError:  except KeyError:
# Line 697  except KeyError: Line 705  except KeyError:
705     pass     pass
706  try:  try:
707     lib_path = env['python_lib_path']     lib_path = env['python_lib_path']
708       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
709     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
710  except KeyError:  except KeyError:
711     pass     pass
# Line 836  try: Line 845  try:
845  except KeyError:  except KeyError:
846     api_doxygen = None     api_doxygen = None
847    
848    global_revision="$Revison"
849  try:  try:
850     svn_pipe = os.popen("svnversion -n .")     svn_pipe = os.popen("svnversion -n .")
851     global_revision = svn_pipe.readlines()     global_revision = svn_pipe.readlines()
852     svn_pipe.close()     svn_pipe.close()
    global_revision = re.sub(":.*", "", global_revision[0])  
    global_revision = re.sub("[^0-9]", "", global_revision)  
853  except:  except:
854     global_revision = "0"     print "Extracting revision number failed. Using %s instead."%global_revision
855    global_revision = re.sub(":.*", "", global_revision[0])
856    global_revision = re.sub("[^0-9]", "", global_revision)
857  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)  env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
858    
859  # Python install - esys __init__.py  # Python install - esys __init__.py

Legend:
Removed from v.1360  
changed lines
  Added in v.1389

  ViewVC Help
Powered by ViewVC 1.1.26