/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 817 by ksteube, Sat Aug 26 03:08:52 2006 UTC revision 1024 by gross, Tue Mar 13 06:31:50 2007 UTC
# Line 1  Line 1 
1  #          Copyright 2006 by ACcESS MNRF                    #         Copyright 2006 by ACcESS MNRF
2  #                                                            #
3  #              http://www.access.edu.au                      #              http://www.access.edu.au
4  #       Primary Business: Queensland, Australia              #       Primary Business: Queensland, Australia
5  #  Licensed under the Open Software License version 3.0      #  Licensed under the Open Software License version 3.0
6  #     http://www.opensource.org/licenses/osl-3.0.php        #     http://www.opensource.org/licenses/osl-3.0.php
7  #                                                            #
8  #  #
9  #  #
10    
11  # top-level Scons configuration file for all esys13 modules  # top-level Scons configuration file for all esys13 modules
12  # Begin initialisation Section  # Begin initialisation Section
13  # all of this section just intialises default environments and helper  # all of this section just intialises default environments and helper
14  # scripts. You shouldn't need to modify this section.  # scripts. You shouldn't need to modify this section.
15  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
16  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
# Line 18  EnsurePythonVersion(2,3) Line 18  EnsurePythonVersion(2,3)
18  # import tools:  # import tools:
19  import glob  import glob
20  import sys, os  import sys, os
21    import socket
22  # Add our extensions  # Add our extensions
23  if sys.path.count('scons')==0: sys.path.append('scons')  if sys.path.count('scons')==0: sys.path.append('scons')
24  import scons_extensions  import scons_extensions
# Line 53  else: Line 54  else:
54  if ARGUMENTS.get('options_file',0):  if ARGUMENTS.get('options_file',0):
55     options_file = ARGUMENTS.get('options_file',0)     options_file = ARGUMENTS.get('options_file',0)
56  else:  else:
    import socket  
57     from string import ascii_letters,digits     from string import ascii_letters,digits
58     hostname=""     hostname=""
59     for s in socket.gethostname().split('.')[0]:     for s in socket.gethostname().split('.')[0]:
# Line 62  else: Line 62  else:
62        else:        else:
63           hostname+="_"           hostname+="_"
64     options_file = "scons/"+hostname+"_options.py"     options_file = "scons/"+hostname+"_options.py"
65    print "option file is ",options_file
66    
67  opts = Options(options_file, ARGUMENTS)  opts = Options(options_file, ARGUMENTS)
68  opts.AddOptions(  opts.AddOptions(
69  # Where to install esys stuff  # Where to install esys stuff
70    ('incinstall', 'where the esys headers will be installed', Dir('#.').abspath+'/include'),    ('incinstall', 'where the esys headers will be installed', Dir('#.').abspath+'/include'),
71    ('libinstall', 'where the esys libraries will be installed', Dir('#.').abspath+'/lib'),    ('libinstall', 'where the esys libraries will be installed', Dir('#.').abspath+'/lib'),
72    ('pyinstall', 'where the esys python modules will be installed', Dir('#.').abspath),    ('pyinstall', 'where the esys python modules will be installed', Dir('#.').abspath),
73    ('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"),
74    ('test_zipfile', 'the test zip file will be installed.', Dir('#.').abspath+"/release/escript_tests.zip"),    ('test_zipfile', 'the test zip file will be installed.', Dir('#.').abspath+"/release/escript_tests.zip"),
75    ('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"),
76    ('test_tarfile', 'the test tar file will be installed.', Dir('#.').abspath+"/release/escript_tests.tar.gz"),    ('test_tarfile', 'the test tar file will be installed.', Dir('#.').abspath+"/release/escript_tests.tar.gz"),
77    ('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"),
78    ('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"),
79    ('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"),
80    ('api_epydoc', 'name of the epydoc api docs directory',Dir('#.').abspath+"/release/doc/epydoc"),    ('api_epydoc', 'name of the epydoc api docs directory',Dir('#.').abspath+"/release/doc/epydoc"),
81    ('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"),
82  # Compilation options  # Compilation options
83    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
84    ('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 94  opts.AddOptions( Line 95  opts.AddOptions(
95    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
96    ('tar_flags','flags for zip files','-c -z'),    ('tar_flags','flags for zip files','-c -z'),
97  # MKL  # MKL
98    PathOption('mkl_path', 'Path to MKL includes', None),    PathOption('mkl_path', 'Path to MKL includes', None),
99    PathOption('mkl_lib_path', 'Path to MKL libs', None),    PathOption('mkl_lib_path', 'Path to MKL libs', None),
100    ('mkl_libs', 'MKL libraries to link with', None),    ('mkl_libs', 'MKL libraries to link with', None),
101  # SCSL  # SCSL
102    PathOption('scsl_path', 'Path to SCSL includes', None),    PathOption('scsl_path', 'Path to SCSL includes', None),
103    PathOption('scsl_lib_path', 'Path to SCSL libs', None),    PathOption('scsl_lib_path', 'Path to SCSL libs', None),
104    ('scsl_libs', 'SCSL libraries to link with', None),    ('scsl_libs', 'SCSL libraries to link with', None),
105    ('scsl_libs_MPI', 'SCSL libraries to link with for MPI build', None),    ('scsl_libs_MPI', 'SCSL libraries to link with for MPI build', None),
106  # UMFPACK  # UMFPACK
107    PathOption('ufc_path', 'Path to UFconfig includes', ufc_path_default),    PathOption('ufc_path', 'Path to UFconfig includes', ufc_path_default),
108    PathOption('umf_path', 'Path to UMFPACK includes', umf_path_default),    PathOption('umf_path', 'Path to UMFPACK includes', umf_path_default),
109    PathOption('umf_lib_path', 'Path to UMFPACK libs', umf_lib_path_default),    PathOption('umf_lib_path', 'Path to UMFPACK libs', umf_lib_path_default),
110    ('umf_libs', 'UMFPACK libraries to link with', umf_libs_default),    ('umf_libs', 'UMFPACK libraries to link with', umf_libs_default),
111  # AMD (used by UMFPACK)  # AMD (used by UMFPACK)
112    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
113    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
114    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('amd_libs', 'AMD libraries to link with', amd_libs_default),
115  # BLAS  # BLAS
116    PathOption('blas_path', 'Path to BLAS includes', None),    PathOption('blas_path', 'Path to BLAS includes', None),
117    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
118    ('blas_libs', 'BLAS libraries to link with', None),    ('blas_libs', 'BLAS libraries to link with', None),
119    # netCDF
120      ('useNetCDF', 'switch on/off the usage of netCDF', 'yes'),
121      PathOption('netCDF_path', 'Path to netCDF includes', '/usr/local/include'),
122      PathOption('netCDF_lib_path', 'Path to netCDF libs', '/usr/local/lib'),
123      ('netCDF_libs_cxx', 'netCDF C++ libraries to link with', [ 'netcdf_c++', 'netcdf'] ),
124  # Python  # Python
125  # locations of include files for python  # locations of include files for python
126    PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),    PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),
127    PathOption('python_lib_path', 'Path to Python libs', '/usr/lib'),    PathOption('python_lib_path', 'Path to Python libs', '/usr/lib'),
128    ('python_lib', 'Python libraries to link with', ["python%s.%s"%(sys.version_info[0],sys.version_info[1]),]),    ('python_lib', 'Python libraries to link with', ["python%s.%s"%(sys.version_info[0],sys.version_info[1]),]),
129  # Boost  # Boost
130    PathOption('boost_path', 'Path to Boost includes', '/usr/include'),    PathOption('boost_path', 'Path to Boost includes', '/usr/include'),
131    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),
132    ('boost_lib', 'Boost libraries to link with', ['boost_python',]),    ('boost_lib', 'Boost libraries to link with', ['boost_python',]),
133  # Doc building  # Doc building
134  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),
135  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),
136  # PAPI  # PAPI
137    PathOption('papi_path', 'Path to PAPI includes', None),    PathOption('papi_path', 'Path to PAPI includes', None),
138    PathOption('papi_lib_path', 'Path to PAPI libs', None),    PathOption('papi_lib_path', 'Path to PAPI libs', None),
139    ('papi_libs', 'PAPI libraries to link with', None),    ('papi_libs', 'PAPI libraries to link with', None),
140  # MPI  # MPI
141    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),
142  )  )
   
 # Initialise Scons Build Environment  
 # check for user environment variables we are interested in  
 try:  
    python_path = os.environ['PYTHONPATH']  
 except KeyError:  
    python_path = ''  
 try:  
    path = os.environ['PATH']  
 except KeyError:  
    path = ''  
 try:  
    ld_library_path = os.environ['LD_LIBRARY_PATH']  
 except KeyError:  
    ld_library_path = ''  
   
143  # Note: On the Altix the intel compilers are not automatically  # Note: On the Altix the intel compilers are not automatically
144  # detected by scons intelc.py script. The Altix has a different directory  # detected by scons intelc.py script. The Altix has a different directory
145  # path and in some locations the "modules" facility is used to support  # path and in some locations the "modules" facility is used to support
# Line 157  except KeyError: Line 147  except KeyError:
147  # environment which isn't the "scons way"  # environment which isn't the "scons way"
148  # This doesn't impact linux and windows which will use the default compiler (g++ or msvc, or the intel compiler if it is installed on both platforms)  # This doesn't impact linux and windows which will use the default compiler (g++ or msvc, or the intel compiler if it is installed on both platforms)
149  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix
150    
151  if os.name != "nt" and os.uname()[4]=='ia64':  if os.name != "nt" and os.uname()[4]=='ia64':
152     env = Environment(ENV = {'PATH':path}, tools = ['default', 'intelc'], options = opts)     env = Environment(ENV = {'PATH':path}, tools = ['default', 'intelc'], options = opts)
    env['ENV']['PATH'] = path  
    env['ENV']['LD_LIBRARY_PATH'] = ld_library_path  
    env['ENV']['PYTHONPATH'] = python_path  
153     if env['CXX'] == 'icpc':     if env['CXX'] == 'icpc':
154        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
155  elif os.name == "nt":  elif os.name == "nt":
156     env = Environment(tools = ['default', 'intelc'], options = opts)     env = Environment(tools = ['default', 'intelc'], options = opts)
    env['ENV']['PYTHONPATH'] = python_path  
157  else:  else:
158     env = Environment(tools = ['default'], options = opts)     env = Environment(tools = ['default'], options = opts)
159    # Initialise Scons Build Environment
160    # check for user environment variables we are interested in
161    try:
162       python_path = os.environ['PYTHONPATH']
163       env['ENV']['PYTHONPATH'] = python_path
164    except KeyError:
165       python_path = ''
166    
167    try:
168       path = os.environ['PATH']
169     env['ENV']['PATH'] = path     env['ENV']['PATH'] = path
170    except KeyError:
171       path = ''
172    try:
173       ld_library_path = os.environ['LD_LIBRARY_PATH']
174     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
175     env['ENV']['PYTHONPATH'] = python_path  except KeyError:
176       ld_library_path = ''
177    
178    
179  # Setup help for options  # Setup help for options
180  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
# Line 195  try: Line 197  try:
197     incinstall = env['incinstall']     incinstall = env['incinstall']
198     env.Append(CPPPATH = [incinstall,])     env.Append(CPPPATH = [incinstall,])
199  except KeyError:  except KeyError:
200     incinstall = None       incinstall = None
201  try:  try:
202     libinstall = env['libinstall']     libinstall = env['libinstall']
203     env.Append(LIBPATH = [libinstall,])     env.Append(LIBPATH = [libinstall,])
# Line 204  try: Line 206  try:
206        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
207        env.PrependENVPath('PATH', env['boost_lib_path'])        env.PrependENVPath('PATH', env['boost_lib_path'])
208  except KeyError:  except KeyError:
209     libinstall = None       libinstall = None
210  try:  try:
211     pyinstall = env['pyinstall']+'/esys' # all targets will install into pyinstall/esys but PYTHONPATH points at straight pyinstall so you go import esys.escript etc     pyinstall = env['pyinstall']+'/esys' # all targets will install into pyinstall/esys but PYTHONPATH points at straight pyinstall so you go import esys.escript etc
212     env.PrependENVPath('PYTHONPATH', env['pyinstall'])     env.PrependENVPath('PYTHONPATH', env['pyinstall'])
213  except KeyError:  except KeyError:
214     pyinstall = None       pyinstall = None
215  try:  try:
216     dodebug = env['dodebug']     dodebug = env['dodebug']
217  except KeyError:  except KeyError:
218     dodebug = None       dodebug = None
219  try:  try:
220     useMPI = env['useMPI']     useMPI = env['useMPI']
221  except KeyError:  except KeyError:
222     useMPI = None       useMPI = None
223  try:  try:
224     cc_defines = env['cc_defines']     cc_defines = env['cc_defines']
225     env.Append(CPPDEFINES = cc_defines)     env.Append(CPPDEFINES = cc_defines)
# Line 236  if dodebug: Line 238  if dodebug:
238        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
239      except KeyError:      except KeyError:
240        pass        pass
241    else:                          else:
242      try:      try:
243        flags = env['cc_flags_debug']        flags = env['cc_flags_debug']
244        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
# Line 285  try: Line 287  try:
287     flags = env['ar_flags']     flags = env['ar_flags']
288     env.Append(ARFLAGS = flags)     env.Append(ARFLAGS = flags)
289  except KeyError:  except KeyError:
290     ar_flags = None       ar_flags = None
291  try:  try:
292     sys_libs = env['sys_libs']     sys_libs = env['sys_libs']
293  except KeyError:  except KeyError:
294     sys_libs = ''     sys_libs = ''
295    
296  try:  try:
297     tar_flags = env['tar_flags']     tar_flags = env['tar_flags']
# Line 329  try: Line 331  try:
331  except KeyError:  except KeyError:
332     pass     pass
333    
334  if useMPI:    if useMPI:
335    try:    try:
336      scsl_libs = env['scsl_libs_MPI']      scsl_libs = env['scsl_libs_MPI']
337    except KeyError:    except KeyError:
338      scsl_libs = ''      scsl_libs = ''
339  else:          else:
340    try:    try:
341      scsl_libs = env['scsl_libs']      scsl_libs = env['scsl_libs']
342    except KeyError:    except KeyError:
# Line 352  try: Line 354  try:
354  except KeyError:  except KeyError:
355     pass     pass
356    
357  if useMPI:    if useMPI:
358      umf_libs = ''      umf_libs = ''
359  else:  else:
360     try:     try:
# Line 378  try: Line 380  try:
380  except KeyError:  except KeyError:
381     pass     pass
382    
383  if useMPI:    if useMPI:
384      amd_libs = ''      amd_libs = ''
385  else:  else:
386     try:     try:
# Line 404  except KeyError: Line 406  except KeyError:
406     blas_libs = ''     blas_libs = ''
407    
408  try:  try:
409       useNetCDF = env['useNetCDF']
410    except KeyError:
411       useNetCDF = 'yes'
412       pass
413    
414    if not useNetCDF == 'yes':
415       print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."
416      
417    if useNetCDF == 'yes':
418       try:
419          includes = env['netCDF_path']
420          env.Append(CPPPATH = [includes,])
421       except KeyError:
422          pass
423    
424       try:
425          lib_path = env['netCDF_lib_path']
426          env.Append(LIBPATH = [lib_path,])
427       except KeyError:
428          pass
429    
430       try:
431          netCDF_libs_cxx = env['netCDF_libs_cxx']
432       except KeyError:
433          netCDF_libs_cxx = [ ]
434    else:
435       netCDF_libs_cxx=[ ]
436    
437    try:
438     includes = env['boost_path']     includes = env['boost_path']
439     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
440  except KeyError:  except KeyError:
# Line 416  except KeyError: Line 447  except KeyError:
447  try:  try:
448     boost_lib = env['boost_lib']     boost_lib = env['boost_lib']
449  except KeyError:  except KeyError:
450     boost_lib = None       boost_lib = None
451  try:  try:
452     includes = env['python_path']     includes = env['python_path']
453     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 430  except KeyError: Line 461  except KeyError:
461  try:  try:
462     python_lib = env['python_lib']     python_lib = env['python_lib']
463  except KeyError:  except KeyError:
464     python_lib = None       python_lib = None
465  try:  try:
466     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
467  except KeyError:  except KeyError:
468     doxygen_path = None       doxygen_path = None
469  try:  try:
470     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
471  except KeyError:  except KeyError:
472     epydoc_path = None       epydoc_path = None
473  try:  try:
474     includes = env['papi_path']     includes = env['papi_path']
475     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 452  except KeyError: Line 483  except KeyError:
483  try:  try:
484     papi_libs = env['papi_libs']     papi_libs = env['papi_libs']
485  except KeyError:  except KeyError:
486     papi_libs = None       papi_libs = None
487    
488    
489  try:  try:
490     src_zipfile = env.File(env['src_zipfile'])     src_zipfile = env.File(env['src_zipfile'])
491  except KeyError:  except KeyError:
492     src_zipfile = None       src_zipfile = None
493  try:  try:
494     test_zipfile = env.File(env['test_zipfile'])     test_zipfile = env.File(env['test_zipfile'])
495  except KeyError:  except KeyError:
496     test_zipfile = None       test_zipfile = None
497  try:  try:
498     examples_zipfile = env.File(env['examples_zipfile'])     examples_zipfile = env.File(env['examples_zipfile'])
499  except KeyError:  except KeyError:
500     examples_zipfile = None       examples_zipfile = None
501    
502  try:  try:
503     src_tarfile = env.File(env['src_tarfile'])     src_tarfile = env.File(env['src_tarfile'])
504  except KeyError:  except KeyError:
505     src_tarfile = None       src_tarfile = None
506  try:  try:
507     test_tarfile = env.File(env['test_tarfile'])     test_tarfile = env.File(env['test_tarfile'])
508  except KeyError:  except KeyError:
509     test_tarfile = None       test_tarfile = None
510  try:  try:
511     examples_tarfile = env.File(env['examples_tarfile'])     examples_tarfile = env.File(env['examples_tarfile'])
512  except KeyError:  except KeyError:
513     examples_tarfile = None       examples_tarfile = None
514    
515  try:  try:
516     guide_pdf = env.File(env['guide_pdf'])     guide_pdf = env.File(env['guide_pdf'])
517  except KeyError:  except KeyError:
518     guide_pdf = None       guide_pdf = None
519    
520  try:  try:
521     guide_html_index = env.File('index.htm',env['guide_html'])     guide_html_index = env.File('index.htm',env['guide_html'])
522  except KeyError:  except KeyError:
523     guide_html_index = None       guide_html_index = None
524    
525  try:  try:
526     api_epydoc = env.Dir(env['api_epydoc'])     api_epydoc = env.Dir(env['api_epydoc'])
527  except KeyError:  except KeyError:
528     api_epydoc = None       api_epydoc = None
529    
530  # Zipgets  # Zipgets
531      
532  env.Default(libinstall)  env.Default(libinstall)
533  env.Default(incinstall)  env.Default(incinstall)
534  env.Default(pyinstall)  env.Default(pyinstall)
535  env.Alias('release_src',[ src_zipfile, src_tarfile ])    env.Alias('release_src',[ src_zipfile, src_tarfile ])
536  env.Alias('release_tests',[ test_zipfile, test_tarfile])  env.Alias('release_tests',[ test_zipfile, test_tarfile])
537  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])
538  env.Alias('api_epydoc',api_epydoc)  env.Alias('api_epydoc',api_epydoc)
# Line 520  init_target = env.Command(pyinstall+'/__ Line 551  init_target = env.Command(pyinstall+'/__
551  env.Alias(init_target)  env.Alias(init_target)
552    
553  # Allow sconscripts to see the env  # Allow sconscripts to see the env
554  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs",  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs_cxx", "useNetCDF",
555      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
556          "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",
557          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI"])          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI"])
558    
# Line 542  env.Tar(test_tarfile, release_testfiles) Line 573  env.Tar(test_tarfile, release_testfiles)
573  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
574  # C/C++ Libraries  # C/C++ Libraries
575  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
576  env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)  # bruce is removed for now as it doesn't really do anything
577    # env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)
578  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
579  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
580  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
581  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)
582  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
583  env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)  env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)
584    env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)
585    
586  # added by Ben Cumming  # added by Ben Cumming
587  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)
588  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)
Legend:
Removed from v.817  
changed lines
  Added in v.1024
  ViewVC Help
Powered by ViewVC 1.1.26