/[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 706 by gross, Sat Apr 8 16:13:02 2006 UTC revision 707 by gross, Wed Apr 12 23:58:02 2006 UTC
# Line 46  opts.AddOptions( Line 46  opts.AddOptions(
46    ('libinstall', 'where the esys libraries will be installed', Dir('#.').abspath+'/lib'),    ('libinstall', 'where the esys libraries will be installed', Dir('#.').abspath+'/lib'),
47    ('pyinstall', 'where the esys python modules will be installed', Dir('#.').abspath),    ('pyinstall', 'where the esys python modules will be installed', Dir('#.').abspath),
48    ('src_zipfile', 'the source zip file will be installed.', Dir('#.').abspath+"/release/escript_src.zip"),    ('src_zipfile', 'the source zip file will be installed.', Dir('#.').abspath+"/release/escript_src.zip"),
49    ('test_zipfile', 'the test zip file will be installed.', Dir('#.').abspath+"/release/escript_src_tests.zip"),    ('test_zipfile', 'the test zip file will be installed.', Dir('#.').abspath+"/release/escript_tests.zip"),
50    ('src_tarfile', 'the source tar file will be installed.', Dir('#.').abspath+"/release/escript_src.tar.gz"),    ('src_tarfile', 'the source tar file will be installed.', Dir('#.').abspath+"/release/escript_src.tar.gz"),
51    ('test_tarfile', 'the test tar file will be installed.', Dir('#.').abspath+"/release/escript_src_tests.tar.gz"),    ('test_tarfile', 'the test tar file will be installed.', Dir('#.').abspath+"/release/escript_tests.tar.gz"),
52    ('doc', 'where the doc files will be installed', Dir('#.').abspath+'/release/doc'),    ('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"),
54      ('guide_pdf', 'name of the user guide in pdf format', Dir('#.').abspath+"/release/doc/user/guide.pdf"),
55      ('guide_html', 'name of the directory for user guide in html format', Dir('#.').abspath+"/release/doc/user/html"),
56  # Compilation options  # Compilation options
57    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
58    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),
# Line 316  try: Line 318  try:
318  except KeyError:  except KeyError:
319     papi_libs = None       papi_libs = None  
320    
321    
322  try:  try:
323     src_zipfile = env['src_zipfile']     src_zipfile = env.File(env['src_zipfile'])
324  except KeyError:  except KeyError:
325     src_zipfile = None       src_zipfile = None  
   
   
326  try:  try:
327     test_zipfile = env['test_zipfile']     test_zipfile = env.File(env['test_zipfile'])
328  except KeyError:  except KeyError:
329     test_zipfile = None       test_zipfile = None  
330    try:
331       examples_zipfile = env.File(env['examples_zipfile'])
332    except KeyError:
333       examples_zipfile = None  
334    
335  try:  try:
336     src_tarfile = env['src_tarfile']     src_tarfile = env.File(env['src_tarfile'])
337  except KeyError:  except KeyError:
338     src_tarfile = None       src_tarfile = None  
   
   
339  try:  try:
340     test_tarfile = env['test_tarfile']     test_tarfile = env.File(env['test_tarfile'])
341  except KeyError:  except KeyError:
342     test_tarfile = None       test_tarfile = None  
343    try:
344       examples_tarfile = env.File(env['examples_tarfile'])
345    except KeyError:
346       examples_tarfile = None  
347    
348  try:  try:
349     doc = env['doc']     guide_pdf = env.File(env['guide_pdf'])
350  except KeyError:  except KeyError:
351     doc = None       guide_pdf = None  
352    
353    try:
354       guide_html_index = env.File('index.htm',env['guide_html'])
355    except KeyError:
356       guide_html_index = None  
357    
358  # Zipgets  # Zipgets
359  env.Default(libinstall)  env.Default(libinstall)
# Line 349  env.Default(incinstall) Line 361  env.Default(incinstall)
361  env.Default(pyinstall)  env.Default(pyinstall)
362  env.Alias('release_src',[ src_zipfile, src_tarfile ])    env.Alias('release_src',[ src_zipfile, src_tarfile ])  
363  env.Alias('release_tests',[ test_zipfile, test_tarfile])  env.Alias('release_tests',[ test_zipfile, test_tarfile])
364  env.Alias('release', ['release_src', 'release_tests'])  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])
365  env.Alias('docs')  env.Alias('docs',[ 'release_examples', guide_pdf, guide_html_index ])
366    env.Alias('release', ['release_src', 'release_tests', 'docs'])
367  env.Alias('build_tests')    # target to build all C++ tests  env.Alias('build_tests')    # target to build all C++ tests
368  env.Alias('build_py_tests') # target to build all python tests  env.Alias('build_py_tests') # target to build all python tests
369  env.Alias('build_all_tests', [ 'build_tests', 'build_py_tests' ] ) # target to build all python tests  env.Alias('build_all_tests', [ 'build_tests', 'build_py_tests' ] ) # target to build all python tests
# Line 366  env.Command(pyinstall+'/__init__.py', No Line 379  env.Command(pyinstall+'/__init__.py', No
379  # Allow sconscripts to see the env  # Allow sconscripts to see the env
380  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",
381      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "epydoc_pythonpath", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "epydoc_pythonpath", "papi_libs",
382          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "doc" ])          "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile",
383            "guide_pdf", "guide_html_index"])
384    
385  # End initialisation section  # End initialisation section
386  # Begin configuration section  # Begin configuration section
# Line 390  env.SConscript(dirs = ['escript/src'], b Line 404  env.SConscript(dirs = ['escript/src'], b
404  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
405  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
406  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)
407  #env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
408    #env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0) not part of beta.0
 # FIXME:need to be incorporated into build system  
 # FIXME: 'doc/SConstruct']  
 # FIXME: 'doc/SConstruct']  

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

  ViewVC Help
Powered by ViewVC 1.1.26