/[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 1063 by gross, Mon Mar 26 08:29:18 2007 UTC revision 1131 by gross, Tue May 8 05:52:21 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_libs + ['esysUtils'] + sys_libs )
25  py_wrapper_local_env.Append(LIBS = [boost_lib, lib_name, 'esysUtils', sys_libs ] )  py_wrapper_local_env.Append(LIBS = boost_libs + [ lib_name, 'esysUtils'] + sys_libs )
26  if useNetCDF == 'yes':  if useNetCDF == 'yes':
27      local_env.Append(LIBS = netCDF_libs_cxx)      local_env.Append(LIBS = netCDF_libs)
28      local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])      local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
29      py_wrapper_local_env.Append(LIBS = netCDF_libs_cxx)      if IS_WINDOWS_PLATFORM: local_env.Append(CPPDEFINES = [ 'DLL_NETCDF' ])
30        py_wrapper_local_env.Append(LIBS = netCDF_libs)
31      py_wrapper_local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])      py_wrapper_local_env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
32    
33  local_env.Append(CPPDEFINES = [ 'ESCRIPT_EXPORTS'] )  local_env.Append(CPPDEFINES = [ 'ESCRIPT_EXPORTS'] )
# Line 51  Export('dep_lib') Line 52  Export('dep_lib')
52  # add source files to release  # add source files to release
53  release_srcfiles = [ env.File(x) for x in filenames ] + [env.File("SConscript"), ]  release_srcfiles = [ env.File(x) for x in filenames ] + [env.File("SConscript"), ]
54  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
55  env.Tar(src_tarfile, release_srcfiles)  try:
56       env.Tar(src_tarfile, release_srcfiles)
57    except AttributeError:
58       pass
59  # Call the python sconscript  # Call the python sconscript
60  env.SConscript(dirs = ['#/escript/py_src'], build_dir='py', duplicate=0)  env.SConscript(dirs = ['#/escript/py_src'], build_dir='py', duplicate=0)
61    

Legend:
Removed from v.1063  
changed lines
  Added in v.1131

  ViewVC Help
Powered by ViewVC 1.1.26