/[escript]/trunk/escript/src/SConscript
ViewVC logotype

Diff of /trunk/escript/src/SConscript

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

revision 1311 by phornby, Mon Aug 13 22:09:00 2007 UTC revision 1312 by ksteube, Mon Sep 24 06:18:44 2007 UTC
# Line 21  headers = [x for x in filenames if os.pa Line 21  headers = [x for x in filenames if os.pa
21  # Filter out sources that should not be in the list automatically  # Filter out sources that should not be in the list automatically
22  sources.remove(py_wrapper_source) # FIXME: should probably refactor the source tree so the python wrapper isn't colocated with c++ sources  sources.remove(py_wrapper_source) # FIXME: should probably refactor the source tree so the python wrapper isn't colocated with c++ sources
23    
24  local_env.Append(LIBS = [boost_lib, 'esysUtils'] + sys_libs )  local_env.Append(LIBS = [boost_lib] + [ 'esysUtils'] + sys_libs + netCDF_libs + mpi_libs)
25  py_wrapper_local_env.Append(LIBS = [boost_lib, lib_name, 'esysUtils'] + sys_libs )  py_wrapper_local_env.Append(LIBS = [boost_lib] + [ lib_name, 'esysUtils'] + sys_libs + netCDF_libs)
26    if useNetCDF == 'yes':
27        local_env.Append(LIBS = netCDF_libs)
28        local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
29        py_wrapper_local_env.Append(LIBS = netCDF_libs)
30        py_wrapper_local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
31    
32    if papi_instrument_solver:
33       local_env.Append(CPPDEFINES=['PAPI',])
34    if papi_libs:
35       local_env.Append(LIBS = papi_libs)
36       local_env.Append(CPPDEFINES=['BLOCKPAPI',])
37    
38  local_env.Append(CPPDEFINES = [ 'ESCRIPT_EXPORTS'] )  local_env.Append(CPPDEFINES = [ 'ESCRIPT_EXPORTS'] )
39    
# Line 46  Export('dep_lib') Line 57  Export('dep_lib')
57  # add source files to release  # add source files to release
58  release_srcfiles = [ env.File(x) for x in filenames ] + [env.File("SConscript"), ]  release_srcfiles = [ env.File(x) for x in filenames ] + [env.File("SConscript"), ]
59  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
60  try:  env.Tar(src_tarfile, release_srcfiles)
61     env.Tar(src_tarfile, release_srcfiles)  
 except AttributeError:  
    pass  
62  # Call the python sconscript  # Call the python sconscript
63  env.SConscript(dirs = ['#/escript/py_src'], build_dir='py', duplicate=0)  env.SConscript(dirs = ['#/escript/py_src'], build_dir='py', duplicate=0)
64    

Legend:
Removed from v.1311  
changed lines
  Added in v.1312

  ViewVC Help
Powered by ViewVC 1.1.26