/[escript]/branches/amg_from_3530/SConstruct
ViewVC logotype

Diff of /branches/amg_from_3530/SConstruct

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

revision 682 by robwdcock, Mon Mar 27 02:43:09 2006 UTC revision 691 by robwdcock, Wed Mar 29 03:43:36 2006 UTC
# Line 66  opts.AddOptions( Line 66  opts.AddOptions(
66    PathOption('umf_lib_path', 'Path to UMF libs', None),    PathOption('umf_lib_path', 'Path to UMF libs', None),
67    ('umf_libs', 'UMF libraries to link with', None),    ('umf_libs', 'UMF libraries to link with', None),
68  # Python  # Python
69    PathOption('python_path', 'Path to Python includes', '/usr/include'),  # locations of include files for python
70      PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),
71    PathOption('python_lib_path', 'Path to Python libs', '/usr/lib'),    PathOption('python_lib_path', 'Path to Python libs', '/usr/lib'),
72    ('python_lib', 'Python libraries to link with', ['python2.3',]),    ('python_lib', 'Python libraries to link with', ["python%s.%s"%(sys.version_info[0],sys.version_info[1]),]),
73  # Boost  # Boost
74    PathOption('boost_path', 'Path to Boost includes', '/usr/include'),    PathOption('boost_path', 'Path to Boost includes', '/usr/include'),
75    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),
# Line 111  except KeyError: Line 112  except KeyError:
112  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix
113    
114  if os.name != "nt" and os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
115     env = Environment(ENV = {'PATH':path, 'LD_LIBRARY_PATH':ld_library_path, 'PYTHONPATH':python_path}, tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH':path}, tools = ['default', 'intelc'], options = opts)
116       env['ENV']['PATH'] = path
117       env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
118       env['ENV']['PYTHONPATH'] = python_path
119     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
120        env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py        env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py
121  elif os.name == "nt":  elif os.name == "nt":
122     # FIXME: Need to implement equivalent of ld library path for windoze     # FIXME: Need to implement equivalent of ld library path for windoze
123     env = Environment(ENV = {'PYTHONPATH':python_path}, tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
124       env['ENV']['PYTHONPATH'] = python_path
125  else:  else:
126     env = Environment(ENV = {'PATH':path, 'LD_LIBRARY_PATH':ld_library_path, 'PYTHONPATH':python_path}, tools = ['default'], options = opts)     env = Environment(tools = ['default'], options = opts)
127       env['ENV']['PATH'] = path
128       env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
129       env['ENV']['PYTHONPATH'] = python_path
130    
131  # Setup help for options  # Setup help for options
132  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
# Line 316  env.Default(pyinstall) Line 324  env.Default(pyinstall)
324  env.Alias('build_tests')  env.Alias('build_tests')
325  env.Alias('run_tests')  env.Alias('run_tests')
326  env.Alias('py_tests')  env.Alias('py_tests')
327    env.Alias('basic_py_tests')
328  env.Alias('all_tests', ['run_tests', 'py_tests'])  env.Alias('all_tests', ['run_tests', 'py_tests'])
329    
330  # Python install - esys __init__.py  # Python install - esys __init__.py
331  # This is just an empty file but stills need to be touched so add a special target and Command. Note you can't use the scons Touch() function as it will not  # This is just an empty file but stills need to be touched so add a special target and Command. Note you can't use the scons Touch() function as it will not
332  # create the file if it doesn't exist  # create the file if it doesn't exist
333  env.Command('esys/__init__.py', None, 'touch $TARGET')  env.Command(pyinstall+'/__init__.py', None, 'touch $TARGET')
334    
335  # Allow sconscripts to see the env  # Allow sconscripts to see the env
336  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",

Legend:
Removed from v.682  
changed lines
  Added in v.691

  ViewVC Help
Powered by ViewVC 1.1.26