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

Diff of /branches/domexper/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 2334 by jfenwick, Thu Mar 26 03:05:33 2009 UTC
# Line 296  if env['usepedantic']: env.Append(CCFLAG Line 296  if env['usepedantic']: env.Append(CCFLAG
296    
297  # MS Windows  # MS Windows
298  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
299    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.AppendENVPath('PATH', [env['boost_lib_path']])
300    env.PrependENVPath('PATH',    [env['libinstall']])    env.AppendENVPath('PATH', [env['libinstall']])
301    if not env['share_esysUtils'] :    if not env['share_esysUtils'] :
302      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
303    if not env['share_paso'] :    if not env['share_paso'] :
304      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
305    
306    if env['usenetcdf']:    if env['usenetcdf']:
307      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.AppendENVPath('PATH',   [env['netCDF_lib_path']])
308    
309  env.Append(ARFLAGS = env['ar_flags'])  env.Append(ARFLAGS = env['ar_flags'])
310    
# Line 408  if env['usevtk']: Line 408  if env['usevtk']:
408    
409  conf = Configure(clone_env(env))  conf = Configure(clone_env(env))
410    
411    print "<1<<<<"+str(conf.env['ENV']['LD_LIBRARY_PATH'])
412    
413    
414  if env['usenetcdf']:  if env['usenetcdf']:
415    conf.env.AppendUnique(CPPPATH = [env['netCDF_path']])    conf.env.AppendUnique(CPPPATH = [env['netCDF_path']])
416    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])
# Line 420  if env['usenetcdf']: Line 423  if env['usenetcdf']:
423  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0
424  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0
425    
426    print "<2<<<<"+str(conf.env['ENV']['LD_LIBRARY_PATH'])
427    
428  # Add NetCDF to environment env if it was found  # Add NetCDF to environment env if it was found
429  if env['usenetcdf']:  if env['usenetcdf']:
430    env = conf.Finish()    env = conf.Finish()
# Line 427  if env['usenetcdf']: Line 432  if env['usenetcdf']:
432  else:  else:
433    conf.Finish()    conf.Finish()
434    
435    print "<A<<<<"+str(env['ENV']['LD_LIBRARY_PATH'])
436    
437  ############ PAPI (optional) ###################################  ############ PAPI (optional) ###################################
438    
439  # Start a new configure environment that reflects what we've already found  # Start a new configure environment that reflects what we've already found
# Line 653  print "" Line 660  print ""
660    
661  ############ Delete option-dependent files #####################  ############ Delete option-dependent files #####################
662    
663  Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.debug")))
664  Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.mpi")))
665  Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.openmp")))
666  Execute(Delete(env['libinstall'] + "pyversion"))  Execute(Delete(os.path.join(env['libinstall'],"pyversion")))
667  if not env['usempi']: Execute(Delete(env['libinstall'] + "/pythonMPI"))  Execute(Delete(os.path.join(env['libinstall'],"buildvars")))
668    if not env['usempi']: Execute(Delete(os.path.join(env['libinstall'],"pythonMPI")))
669    
670    
671  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
# Line 695  env.SConscript(dirs = ['paso/profiling'] Line 703  env.SConscript(dirs = ['paso/profiling']
703  remember_list = []  remember_list = []
704    
705  if env['usedebug']:  if env['usedebug']:
706    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'))
707    
708  if env['usempi']:  if env['usempi']:
709    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'))
710    
711  if env['useopenmp']:  if env['useopenmp']:
712    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'))
713    
714  env.Alias('remember_options', remember_list)  env.Alias('remember_options', remember_list)
715    
# Line 806  env.Alias('build_full',['install_all','b Line 814  env.Alias('build_full',['install_all','b
814    
815  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
816    
817  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'])
818    
819  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
820     try:     try:

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

  ViewVC Help
Powered by ViewVC 1.1.26