/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 5801 by jfenwick, Tue Sep 22 10:37:07 2015 UTC revision 5802 by jfenwick, Wed Sep 23 05:17:26 2015 UTC
# Line 683  install_all_list += ['install_modellib_p Line 683  install_all_list += ['install_modellib_p
683  install_all_list += ['install_pycad_py']  install_all_list += ['install_pycad_py']
684  if env['usempi']:  if env['usempi']:
685      install_all_list += ['install_pythonMPI', 'install_overlord']      install_all_list += ['install_pythonMPI', 'install_overlord']
686    install_all_list += ['install_weipa_py']    
687  install_all=env.Alias('install_all', install_all_list)  install_all=env.Alias('install_all', install_all_list)
688    
689  # Default target is install  # Default target is install
690  env.Default('install_all')  #env.Default('install_all')
691    
692    
693  sanity=env.Alias('sanity', env.Command('dummy','',os.path.join(env['prefix'], 'bin', 'run-escript')+' '+os.path.join(env['prefix'],'scripts', 'release_sanity.py')))  sanity=env.Alias('sanity', env.Command('dummy','',os.path.join(env['prefix'], 'bin', 'run-escript')+' '+os.path.join(env['prefix'],'scripts', 'release_sanity.py')))
694  env.Requires(sanity, install_all)  env.Depends('dummy', install_all)
695  if env['usempi']:  if env['usempi']:
696     env.Requires(sanity, 'build_pythonMPI')     #env.Requires('dummy', ['build_pythonMPI', 'install_pythonMPI'])
697       #env.Requires('dummy', env['prefix']+"/lib/pythonMPI")
698       env.Depends('dummy', ['build_pythonMPI', 'install_pythonMPI'])
699       env.Depends('dummy', env['prefix']+"/lib/pythonMPI")  
700    
701  if 'install_dudley' in install_all_list and \  if 'install_dudley' in install_all_list and \
702     'install_finley' in install_all_list and \     'install_finley' in install_all_list and \
703     'install_ripley' in install_all_list and \     'install_ripley' in install_all_list and \
704     'install_speckley' in install_all_list:     'install_speckley' in install_all_list:
705         #env.AlwaysBuild('sanity')         env.AlwaysBuild('sanity')
706         pass         env.Default('sanity')
707    else:
708        env.Default('install_all')
709    
710  ################## Targets to build and run the test suite ###################  ################## Targets to build and run the test suite ###################
711    

Legend:
Removed from v.5801  
changed lines
  Added in v.5802

  ViewVC Help
Powered by ViewVC 1.1.26