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

Diff of /branches/DataC_2092/SConstruct

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

revision 707 by gross, Wed Apr 12 23:58:02 2006 UTC revision 757 by woo409, Mon Jun 26 13:12:56 2006 UTC
# Line 52  opts.AddOptions( Line 52  opts.AddOptions(
52    ('examples_tarfile', 'the examples tar file will be installed.', Dir('#.').abspath+"/release/doc/escript_examples.tar.gz"),    ('examples_tarfile', 'the examples tar file will be installed.', Dir('#.').abspath+"/release/doc/escript_examples.tar.gz"),
53    ('examples_zipfile', 'the examples zip file will be installed.', Dir('#.').abspath+"/release/doc/escript_examples.zip"),    ('examples_zipfile', 'the examples zip file will be installed.', Dir('#.').abspath+"/release/doc/escript_examples.zip"),
54    ('guide_pdf', 'name of the user guide in pdf format', Dir('#.').abspath+"/release/doc/user/guide.pdf"),    ('guide_pdf', 'name of the user guide in pdf format', Dir('#.').abspath+"/release/doc/user/guide.pdf"),
55      ('api_epydoc', 'name of the epydoc api docs directory',Dir('#.').abspath+"/release/doc/epydoc"),
56    ('guide_html', 'name of the directory for user guide in html format', Dir('#.').abspath+"/release/doc/user/html"),    ('guide_html', 'name of the directory for user guide in html format', Dir('#.').abspath+"/release/doc/user/html"),
57  # Compilation options  # Compilation options
58    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
# Line 86  opts.AddOptions( Line 87  opts.AddOptions(
87    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),
88    ('boost_lib', 'Boost libraries to link with', ['boost_python',]),    ('boost_lib', 'Boost libraries to link with', ['boost_python',]),
89  # Doc building  # Doc building
90    PathOption('doxygen_path', 'Path to Doxygen executable', None),  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),
91    PathOption('epydoc_path', 'Path to Epydoc executable', None),  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),
   PathOption('epydoc_pythonpath', 'Path to Epydoc python files', None),  
92  # PAPI  # PAPI
93    PathOption('papi_path', 'Path to PAPI includes', None),    PathOption('papi_path', 'Path to PAPI includes', None),
94    PathOption('papi_lib_path', 'Path to PAPI libs', None),    PathOption('papi_lib_path', 'Path to PAPI libs', None),
# Line 126  if os.name != "nt" and os.uname()[4]=='i Line 126  if os.name != "nt" and os.uname()[4]=='i
126     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
127        env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py        env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not). FIXME: this behaviour could be directly incorporated into scons intelc.py
128  elif os.name == "nt":  elif os.name == "nt":
    # FIXME: Need to implement equivalent of ld library path for windoze  
129     env = Environment(tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
130     env['ENV']['PYTHONPATH'] = python_path     env['ENV']['PYTHONPATH'] = python_path
131  else:  else:
# Line 161  try: Line 160  try:
160     libinstall = env['libinstall']     libinstall = env['libinstall']
161     env.Append(LIBPATH = [libinstall,])     env.Append(LIBPATH = [libinstall,])
162     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
163       if env['PLATFORM'] == "win32":
164          env.PrependENVPath('PATH', libinstall)
165          env.PrependENVPath('PATH', env['boost_lib_path'])
166  except KeyError:  except KeyError:
167     libinstall = None       libinstall = None  
168  try:  try:
# Line 174  except KeyError: Line 176  except KeyError:
176     dodebug = None       dodebug = None  
177  try:  try:
178     cc_defines = env['cc_defines']     cc_defines = env['cc_defines']
179     env.Append(CPPDEFINES = [cc_defines,])     env.Append(CPPDEFINES = cc_defines)
180  except KeyError:  except KeyError:
181     pass     pass
182  if dodebug:  if dodebug:
# Line 300  try: Line 302  try:
302  except KeyError:  except KeyError:
303     epydoc_path = None       epydoc_path = None  
304  try:  try:
    epydoc_pythonpath = env['epydoc_pythonpath']  
 except KeyError:  
    epydoc_pythonpath = None    
 try:  
305     includes = env['papi_path']     includes = env['papi_path']
306     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
307  except KeyError:  except KeyError:
# Line 355  try: Line 353  try:
353  except KeyError:  except KeyError:
354     guide_html_index = None       guide_html_index = None  
355    
356    try:
357       api_epydoc = env.Dir(env['api_epydoc'])
358    except KeyError:
359       api_epydoc = None  
360    
361  # Zipgets  # Zipgets
362      
363  env.Default(libinstall)  env.Default(libinstall)
364  env.Default(incinstall)  env.Default(incinstall)
365  env.Default(pyinstall)  env.Default(pyinstall)
366  env.Alias('release_src',[ src_zipfile, src_tarfile ])    env.Alias('release_src',[ src_zipfile, src_tarfile ])  
367  env.Alias('release_tests',[ test_zipfile, test_tarfile])  env.Alias('release_tests',[ test_zipfile, test_tarfile])
368  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])
369  env.Alias('docs',[ 'release_examples', guide_pdf, guide_html_index ])  env.Alias('api_epydoc',api_epydoc)
370    env.Alias('docs',[ 'release_examples', guide_pdf, guide_html_index, api_epydoc])
371  env.Alias('release', ['release_src', 'release_tests', 'docs'])  env.Alias('release', ['release_src', 'release_tests', 'docs'])
372  env.Alias('build_tests')    # target to build all C++ tests  env.Alias('build_tests')    # target to build all C++ tests
373  env.Alias('build_py_tests') # target to build all python tests  env.Alias('build_py_tests') # target to build all python tests
# Line 372  env.Alias('py_tests', 'build_py_tests') Line 377  env.Alias('py_tests', 'build_py_tests')
377  env.Alias('all_tests', ['run_tests', 'py_tests']) # target to run all C++ and released python tests  env.Alias('all_tests', ['run_tests', 'py_tests']) # target to run all C++ and released python tests
378    
379  # Python install - esys __init__.py  # Python install - esys __init__.py
380  # This is just an empty file but stills need to be touched so add a special target and Command. Note you can't use the scons Touch() function as it will not  init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
381  # create the file if it doesn't exist  env.Alias(init_target)
 env.Command(pyinstall+'/__init__.py', None, 'touch $TARGET')  
382    
383  # Allow sconscripts to see the env  # Allow sconscripts to see the env
384  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",
385      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "epydoc_pythonpath", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
386          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",
387          "guide_pdf", "guide_html_index"])          "guide_pdf", "guide_html_index", "api_epydoc"])
388    
389  # End initialisation section  # End initialisation section
390  # Begin configuration section  # Begin configuration section
# Line 405  env.SConscript(dirs = ['esysUtils/src'], Line 409  env.SConscript(dirs = ['esysUtils/src'],
409  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
410  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)
411  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
412  #env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0) not part of beta.0  env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)
413    
414    # added by Ben Cumming
415    env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)

Legend:
Removed from v.707  
changed lines
  Added in v.757

  ViewVC Help
Powered by ViewVC 1.1.26