/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2923 by jfenwick, Thu Feb 4 04:05:36 2010 UTC revision 2930 by caltinay, Mon Feb 8 06:25:43 2010 UTC
# Line 479  conf.env.PrependENVPath(LD_LIBRARY_PATH_ Line 479  conf.env.PrependENVPath(LD_LIBRARY_PATH_
479  conf.env.PrependENVPath('PYTHONPATH', prefix)  conf.env.PrependENVPath('PYTHONPATH', prefix)
480  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
481    
482  if not conf.CheckCXXHeader('boost/python.hpp'):  
483    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])  #Yep we still cant figure this one out. - working on it.
484    sys.exit(1)  if not IS_WINDOWS_PLATFORM:
485      if not conf.CheckCXXHeader('boost/python.hpp'):
486  if not conf.CheckFunc('PyObject_SetAttr'):      print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
487    print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])      sys.exit(1)
488    sys.exit(1)  
489      if not conf.CheckFunc('PyObject_SetAttr'):
490        print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])
491        sys.exit(1)
492    
493    
494  # Commit changes to environment  # Commit changes to environment
495  env = conf.Finish()  env = conf.Finish()
# Line 928  build_all_list += ['build_escript'] Line 932  build_all_list += ['build_escript']
932  build_all_list += ['build_finley']  build_all_list += ['build_finley']
933  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
934  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']
935  if env['usesilo']:  build_all_list += ['target_escriptconvert']  build_all_list += ['target_escriptconvert']
936  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
937    
938  install_all_list = []  install_all_list = []
# Line 992  if not IS_WINDOWS_PLATFORM: Line 996  if not IS_WINDOWS_PLATFORM:
996    
997  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')
998    
 env.Alias('release_prep', ['docs', 'install_all'])  
999    env.Alias('release_prep', ['docs', 'install_all'])

Legend:
Removed from v.2923  
changed lines
  Added in v.2930

  ViewVC Help
Powered by ViewVC 1.1.26