/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2910 by caltinay, Wed Feb 3 03:22:31 2010 UTC revision 2967 by caltinay, Wed Mar 3 03:50:46 2010 UTC
# Line 90  adder( Line 90  adder(
90    ('cxx', 'path to C++ compiler', 'DEFAULT'),    ('cxx', 'path to C++ compiler', 'DEFAULT'),
91    ('win_cc_name', 'windows C compiler name if needed', 'msvc'),    ('win_cc_name', 'windows C compiler name if needed', 'msvc'),
92    # The strings -DDEFAULT_ get replaced by scons/<hostname>_options.py or by defaults below    # The strings -DDEFAULT_ get replaced by scons/<hostname>_options.py or by defaults below
93    ('cc_flags', 'C compiler flags to use', '-DEFAULT_1'),    ('cc_flags', 'C/C++ compiler flags to use', '-DEFAULT_1'),
94    ('cc_optim', 'C compiler optimization flags to use', '-DEFAULT_2'),    ('cc_optim', 'C/C++ optimization flags to use', '-DEFAULT_2'),
95    ('cc_debug', 'C compiler debug flags to use', '-DEFAULT_3'),    ('cc_debug', 'C/C++ debug flags to use', '-DEFAULT_3'),
96    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),
97    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),
98    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),
99    ('cc_extra', 'Extra C/C++ flags', ''),    ('cc_extra', 'Extra C compiler flags', ''),
100      ('cxx_extra', 'Extra C++ compiler flags', ''),
101    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
102    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
103    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
# Line 388  env.Append(CPPPATH     = [Dir('include')]) Line 389  env.Append(CPPPATH     = [Dir('include')])
389  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
390  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
391    
392  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CFLAGS = env['cc_extra'])
393    if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])
394  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
395    
396  if env['usepedantic']: env.Append(CCFLAGS = pedantic)  if env['usepedantic']: env.Append(CCFLAGS = pedantic)
# Line 479  conf.env.PrependENVPath(LD_LIBRARY_PATH_ Line 481  conf.env.PrependENVPath(LD_LIBRARY_PATH_
481  conf.env.PrependENVPath('PYTHONPATH', prefix)  conf.env.PrependENVPath('PYTHONPATH', prefix)
482  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
483    
 if not conf.CheckCXXHeader('boost/python.hpp'):  
   print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])  
   sys.exit(1)  
484    
485  if not conf.CheckFunc('PyObject_SetAttr'):  #Yep we still cant figure this one out. - working on it.
486    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'])  if not IS_WINDOWS_PLATFORM:
487    sys.exit(1)    if not conf.CheckCXXHeader('boost/python.hpp'):
488        print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
489        sys.exit(1)
490    
491      if not conf.CheckFunc('PyObject_SetAttr'):
492        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'])
493        sys.exit(1)
494    
495    
496  # Commit changes to environment  # Commit changes to environment
497  env = conf.Finish()  env = conf.Finish()
# Line 928  build_all_list += ['build_escript'] Line 934  build_all_list += ['build_escript']
934  build_all_list += ['build_finley']  build_all_list += ['build_finley']
935  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
936  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']
937  if env['usesilo']:  build_all_list += ['target_escriptconvert']  build_all_list += ['target_escriptconvert']
938  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
939    
940  install_all_list = []  install_all_list = []
# Line 963  env.Alias('build_full',['install_all','b Line 969  env.Alias('build_full',['install_all','b
969    
970  env.Alias('api_epydoc','install_all')  env.Alias('api_epydoc','install_all')
971    
972  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf', 'cookbook_pdf'])
973    
974  build_platform=os.name  build_platform=os.name
975    
# Line 991  if not IS_WINDOWS_PLATFORM: Line 997  if not IS_WINDOWS_PLATFORM:
997  ############ Targets to build PasoTests suite ################  ############ Targets to build PasoTests suite ################
998    
999  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')
1000    
1001    env.Alias('release_prep', ['docs', 'install_all'])

Legend:
Removed from v.2910  
changed lines
  Added in v.2967

  ViewVC Help
Powered by ViewVC 1.1.26