/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2308 by gross, Mon Mar 16 01:20:56 2009 UTC revision 2338 by jfenwick, Fri Mar 27 05:01:49 2009 UTC
# Line 98  opts.AddOptions( Line 98  opts.AddOptions(
98    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),    ('mpi_run', 'mpirun name' , 'mpiexec -np 1'),
99    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),    ('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)', usr_lib),
100    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),    ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', ['mpich' , 'pthread', 'rt']),
101      ('mpi_flavour','Type of MPI execution environment','none'),
102  # ParMETIS  # ParMETIS
103    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),    BoolOption('useparmetis', 'Compile parallel version using ParMETIS', 'yes'),
104    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),    ('parmetis_path', 'Path to ParMETIS includes', '/usr/include'),
# Line 296  if env['usepedantic']: env.Append(CCFLAG Line 297  if env['usepedantic']: env.Append(CCFLAG
297    
298  # MS Windows  # MS Windows
299  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
300    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.AppendENVPath('PATH', [env['boost_lib_path']])
301    env.PrependENVPath('PATH',    [env['libinstall']])    env.AppendENVPath('PATH', [env['libinstall']])
302    if not env['share_esysUtils'] :    if not env['share_esysUtils'] :
303      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
304    if not env['share_paso'] :    if not env['share_paso'] :
305      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
306    
307    if env['usenetcdf']:    if env['usenetcdf']:
308      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.AppendENVPath('PATH',   [env['netCDF_lib_path']])
309    
310  env.Append(ARFLAGS = env['ar_flags'])  env.Append(ARFLAGS = env['ar_flags'])
311    
# Line 653  print "" Line 654  print ""
654    
655  ############ Delete option-dependent files #####################  ############ Delete option-dependent files #####################
656    
657  Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.debug")))
658  Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.mpi")))
659  Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.openmp")))
660  Execute(Delete(env['libinstall'] + "pyversion"))  Execute(Delete(os.path.join(env['libinstall'],"pyversion")))
661  if not env['usempi']: Execute(Delete(env['libinstall'] + "/pythonMPI"))  Execute(Delete(os.path.join(env['libinstall'],"buildvars")))
662    if not env['usempi']: Execute(Delete(os.path.join(env['libinstall'],"pythonMPI")))
663    
664    
665  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
# Line 695  env.SConscript(dirs = ['paso/profiling'] Line 697  env.SConscript(dirs = ['paso/profiling']
697  remember_list = []  remember_list = []
698    
699  if env['usedebug']:  if env['usedebug']:
700    remember_list += env.Command(env['libinstall'] + "/Compiled.with.debug", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.debug"), None, Touch('$TARGET'))
701    
702  if env['usempi']:  if env['usempi']:
703    remember_list += env.Command(env['libinstall'] + "/Compiled.with.mpi", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.mpi"), None, Touch('$TARGET'))
704    
705  if env['useopenmp']:  if env['useopenmp']:
706    remember_list += env.Command(env['libinstall'] + "/Compiled.with.openmp", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.openmp"), None, Touch('$TARGET'))
707    
708  env.Alias('remember_options', remember_list)  env.Alias('remember_options', remember_list)
709    
# Line 745  if env['useopenmp']: Line 747  if env['useopenmp']:
747  else:  else:
748      out+="n"      out+="n"
749  buildvars.write(out+"\n")  buildvars.write(out+"\n")
750    buildvars.write("mpi_flavour="+env['mpi_flavour']+'\n')
751    
752  buildvars.close()  buildvars.close()
753    
# Line 806  env.Alias('build_full',['install_all','b Line 809  env.Alias('build_full',['install_all','b
809    
810  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
811    
812  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])
813    
814  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
815     try:     try:

Legend:
Removed from v.2308  
changed lines
  Added in v.2338

  ViewVC Help
Powered by ViewVC 1.1.26