/[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 3036 by caltinay, Mon Jun 14 00:13:18 2010 UTC revision 3037 by caltinay, Mon Jun 14 00:59:30 2010 UTC
# Line 628  if env['usesilo']: Line 628  if env['usesilo']:
628    
629  # Add the path to Silo to environment env if it was found.  # Add the path to Silo to environment env if it was found.
630  # Note that we do not add the libs since they are only needed for the  # Note that we do not add the libs since they are only needed for the
631  # escriptexport library and tools.  # weipa library and tools.
632  if env['usesilo']:  if env['usesilo']:
633    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
634    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
# Line 818  Export( Line 818  Export(
818  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
819  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)
820  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
821  env.SConscript(dirs = ['dataexporter/src'], build_dir='build/$PLATFORM/dataexporter', duplicate=0)  env.SConscript(dirs = ['weipa/src'], build_dir='build/$PLATFORM/weipa', duplicate=0)
822  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
823  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
824  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
# Line 915  env.Alias('install_esysUtils', ['build_e Line 915  env.Alias('install_esysUtils', ['build_e
915  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])
916  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])
917    
918  env.Alias('build_dataexporter', ['target_install_escriptexport_headers', 'target_escriptexport_so', 'target_escriptexportcpp_so'])  env.Alias('build_weipa', ['target_install_weipa_headers', 'target_weipa_so', 'target_weipacpp_so'])
919  env.Alias('install_dataexporter', ['build_dataexporter', 'target_install_escriptexport_so', 'target_install_escriptexportcpp_so', 'target_install_dataexporter_py'])  env.Alias('install_weipa', ['build_weipa', 'target_install_weipa_so', 'target_install_weipacpp_so', 'target_install_weipa_py'])
920    
921  env.Alias('build_escriptreader', ['target_install_escriptexport_headers', 'target_escriptreader_a'])  env.Alias('build_escriptreader', ['target_install_weipa_headers', 'target_escriptreader_a'])
922  env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])  env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])
923    
924  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])
# Line 931  env.Alias('install_finley', ['build_finl Line 931  env.Alias('install_finley', ['build_finl
931  build_all_list = []  build_all_list = []
932  build_all_list += ['build_esysUtils']  build_all_list += ['build_esysUtils']
933  build_all_list += ['build_paso']  build_all_list += ['build_paso']
934  build_all_list += ['build_dataexporter']  build_all_list += ['build_weipa']
935  build_all_list += ['build_escript']  build_all_list += ['build_escript']
936  build_all_list += ['build_finley']  build_all_list += ['build_finley']
937  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
# Line 943  install_all_list = [] Line 943  install_all_list = []
943  install_all_list += ['target_init']  install_all_list += ['target_init']
944  install_all_list += ['install_esysUtils']  install_all_list += ['install_esysUtils']
945  install_all_list += ['install_paso']  install_all_list += ['install_paso']
946  install_all_list += ['install_dataexporter']  install_all_list += ['install_weipa']
947  install_all_list += ['install_escript']  install_all_list += ['install_escript']
948  install_all_list += ['install_finley']  install_all_list += ['install_finley']
949  install_all_list += ['target_install_pyvisi_py']  install_all_list += ['target_install_pyvisi_py']

Legend:
Removed from v.3036  
changed lines
  Added in v.3037

  ViewVC Help
Powered by ViewVC 1.1.26