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

Diff of /branches/inv2jf/SConstruct

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

revision 2809 by jfenwick, Fri Nov 27 05:03:09 2009 UTC revision 2810 by caltinay, Mon Dec 7 04:13:49 2009 UTC
# Line 604  if env['usesilo']: Line 604  if env['usesilo']:
604    
605  # Add the path to Silo to environment env if it was found.  # Add the path to Silo to environment env if it was found.
606  # 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
607  # escriptreader library and tools.  # escriptexport library and tools.
608  if env['usesilo']:  if env['usesilo']:
609    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
610    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
611    env.Append(CPPDEFINES = ['HAVE_SILO'])    env.Append(CPPDEFINES = ['USE_SILO'])
612    
613  ########### Lapack (optional) ##################################  ########### Lapack (optional) ##################################
614    
# Line 787  Export( Line 787  Export(
787    )    )
788    
789  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)
790  env.SConscript(dirs = ['tools/libescriptreader/src'], build_dir='build/$PLATFORM/tools/libescriptreader', duplicate=0)  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)
791  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
792    env.SConscript(dirs = ['dataexporter/src'], build_dir='build/$PLATFORM/dataexporter', duplicate=0)
793  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
794  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
795  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 859  else: Line 860  else:
860      out+="n"      out+="n"
861  buildvars.write(out+"\n")  buildvars.write(out+"\n")
862  buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')  buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
863  buildvars.write("lapack=")  out="lapack="
864  if env['uselapack']:  if env['uselapack']:
865     buildvars.write('y')     out+="y"
866  else:  else:
867     buildvars.write('n')     out+="n"
868  buildvars.write('\n')  out+="\nsilo="
869    if env['usesilo']:
870       out+="y"
871    else:
872       out+="n"
873    buildvars.write(out+"\n")
874  buildvars.close()  buildvars.close()
875    
876    
# Line 880  env.Alias('install_esysUtils', ['build_e Line 886  env.Alias('install_esysUtils', ['build_e
886  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])
887  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])
888    
889    env.Alias('build_dataexporter', ['target_install_escriptexport_headers', 'target_escriptexport_so'])
890    env.Alias('install_dataexporter', ['build_dataexporter', 'target_install_escriptexport_so'])
891    
892  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'])
893  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])
894    
# Line 890  env.Alias('install_finley', ['build_finl Line 899  env.Alias('install_finley', ['build_finl
899  build_all_list = []  build_all_list = []
900  build_all_list += ['build_esysUtils']  build_all_list += ['build_esysUtils']
901  build_all_list += ['build_paso']  build_all_list += ['build_paso']
902    build_all_list += ['build_dataexporter']
903  build_all_list += ['build_escript']  build_all_list += ['build_escript']
904  build_all_list += ['build_finley']  build_all_list += ['build_finley']
905  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
906  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']
907  if env['usesilo']:  build_all_list += ['target_escript2silo']  if env['usesilo']:  build_all_list += ['target_escriptconvert']
908  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
909    
910  install_all_list = []  install_all_list = []
911  install_all_list += ['target_init']  install_all_list += ['target_init']
912  install_all_list += ['install_esysUtils']  install_all_list += ['install_esysUtils']
913  install_all_list += ['install_paso']  install_all_list += ['install_paso']
914    install_all_list += ['install_dataexporter']
915  install_all_list += ['install_escript']  install_all_list += ['install_escript']
916  install_all_list += ['install_finley']  install_all_list += ['install_finley']
917  install_all_list += ['target_install_pyvisi_py']  install_all_list += ['target_install_pyvisi_py']
# Line 908  install_all_list += ['target_install_mod Line 919  install_all_list += ['target_install_mod
919  install_all_list += ['target_install_pycad_py']  install_all_list += ['target_install_pycad_py']
920  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']
921  #if not IS_WINDOWS_PLATFORM:    install_all_list += ['target_install_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    install_all_list += ['target_install_escript_wrapper']
922  if env['usesilo']:  install_all_list += ['target_install_escript2silo']  if env['usesilo']:  install_all_list += ['target_install_escriptconvert']
923  install_all_list += ['remember_options']  install_all_list += ['remember_options']
924  env.Alias('install_all', install_all_list)  env.Alias('install_all', install_all_list)
925    

Legend:
Removed from v.2809  
changed lines
  Added in v.2810

  ViewVC Help
Powered by ViewVC 1.1.26