/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 5449 by jfenwick, Fri Feb 6 05:31:37 2015 UTC revision 5450 by sshaw, Mon Feb 9 01:39:26 2015 UTC
# Line 542  if not env['verbose']: Line 542  if not env['verbose']:
542  # remove obsolete files  # remove obsolete files
543  if not env['usempi']:  if not env['usempi']:
544      Execute(Delete(os.path.join(env['libinstall'], 'pythonMPI')))      Execute(Delete(os.path.join(env['libinstall'], 'pythonMPI')))
545        Execute(Delete(os.path.join(env['bininstall'], 'escript-overlord')))
546      Execute(Delete(os.path.join(env['libinstall'], 'pythonMPIredirect')))      Execute(Delete(os.path.join(env['libinstall'], 'pythonMPIredirect')))
547    
548  from grouptest import *  from grouptest import *
# Line 565  Export( Line 566  Export(
566    
567  #do not auto build  #do not auto build
568  env.SConscript(dirs = ['tools/escriptconvert'], variant_dir='$BUILD_DIR/$PLATFORM/tools/escriptconvert', duplicate=0)  env.SConscript(dirs = ['tools/escriptconvert'], variant_dir='$BUILD_DIR/$PLATFORM/tools/escriptconvert', duplicate=0)
569    env.SConscript(dirs = ['tools/overlord'], variant_dir='$BUILD_DIR/$PLATFORM/tools/overlord', duplicate=0)
570  env.SConscript(dirs = ['paso/src'], variant_dir='$BUILD_DIR/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], variant_dir='$BUILD_DIR/$PLATFORM/paso', duplicate=0)
571  env.SConscript(dirs = ['weipa/src'], variant_dir='$BUILD_DIR/$PLATFORM/weipa', duplicate=0)  env.SConscript(dirs = ['weipa/src'], variant_dir='$BUILD_DIR/$PLATFORM/weipa', duplicate=0)
572  env.SConscript(dirs = ['escript/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/escript', duplicate=0)
# Line 653  if 'speckley' in env['domains']: build_a Line 655  if 'speckley' in env['domains']: build_a
655  build_all_list += ['build_weipa']  build_all_list += ['build_weipa']
656  if not IS_WINDOWS and 'finley' in env['domains']:  if not IS_WINDOWS and 'finley' in env['domains']:
657      build_all_list += ['build_escriptreader']      build_all_list += ['build_escriptreader']
658  if env['usempi']:   build_all_list += ['build_pythonMPI']  if env['usempi']:
659        build_all_list += ['build_pythonMPI', 'build_overlord']
660  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
661    
662  install_all_list = []  install_all_list = []
# Line 672  if not IS_WINDOWS and 'finley' in env['d Line 675  if not IS_WINDOWS and 'finley' in env['d
675  install_all_list += ['install_downunder_py']  install_all_list += ['install_downunder_py']
676  install_all_list += ['install_modellib_py']  install_all_list += ['install_modellib_py']
677  install_all_list += ['install_pycad_py']  install_all_list += ['install_pycad_py']
678  if env['usempi']:   install_all_list += ['install_pythonMPI']  if env['usempi']:
679        install_all_list += ['install_pythonMPI', 'install_overlord']
680  env.Alias('install_all', install_all_list)  env.Alias('install_all', install_all_list)
681    
682  # Default target is install  # Default target is install

Legend:
Removed from v.5449  
changed lines
  Added in v.5450

  ViewVC Help
Powered by ViewVC 1.1.26