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

Diff of /branches/windows_from_1456_trunk_1574_merged_in/SConstruct

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

revision 684 by robwdcock, Mon Mar 27 07:34:07 2006 UTC revision 694 by gross, Thu Mar 30 11:35:55 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(tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH':path}, tools = ['default', 'intelc'], options = opts)
116     env['ENV']['PATH'] = path     env['ENV']['PATH'] = path
117     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
118     env['ENV']['PYTHONPATH'] = python_path     env['ENV']['PYTHONPATH'] = python_path
# Line 323  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",
# Line 348  env.SConscript(dirs = ['escript/src'], b Line 350  env.SConscript(dirs = ['escript/src'], b
350  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
351  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
352  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)
353    env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)
354    
355  # FIXME:need to be incorporated into build system  # FIXME:need to be incorporated into build system
356  # FIXME: 'pyvisi/SConstruct']  # FIXME: 'pyvisi/SConstruct']

Legend:
Removed from v.684  
changed lines
  Added in v.694

  ViewVC Help
Powered by ViewVC 1.1.26