/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 688 by robwdcock, Tue Mar 28 01:56:24 2006 UTC revision 1416 by ksteube, Mon Feb 25 03:56:17 2008 UTC
# Line 1  Line 1 
1  #          Copyright 2006 by ACcESS MNRF                    #         Copyright 2006 by ACcESS MNRF
 #                                                            
 #              http://www.access.edu.au                      
 #       Primary Business: Queensland, Australia              
 #  Licensed under the Open Software License version 3.0      
 #     http://www.opensource.org/licenses/osl-3.0.php        
 #                                                            
 #  
2  #  #
3    #              http://www.access.edu.au
4    #       Primary Business: Queensland, Australia
5    #  Licensed under the Open Software License version 3.0
6    #     http://www.opensource.org/licenses/osl-3.0.php
7    
8  # top-level Scons configuration file for all esys13 modules  # top-level Scons configuration file for all esys13 modules
9  # Begin initialisation Section  # Begin initialisation Section
10  # all of this section just intialises default environments and helper  # all of this section just intialises default environments and helper
11  # scripts. You shouldn't need to modify this section.  # scripts. You shouldn't need to modify this section.
12  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
13  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
14    
15  import sys, os  
16    #===============================================================
17    #   import tools:
18    import glob
19    import sys, os, re
20  # Add our extensions  # Add our extensions
21  if sys.path.count('scons')==0: sys.path.append('scons')  if sys.path.count('scons')==0: sys.path.append('scons')
22  import scons_extensions  import scons_extensions
23    
24    # We may also need to know where python's site-packages subdirectory lives
25    python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
26    
27    #===============================================================
28    
29    tools_prefix="/usr"
30    
31    #==============================================================================================    
32    #    
33    #    get the installation prefix
34    #
35    prefix = ARGUMENTS.get('prefix', sys.prefix )
36    
37    # We may also need to know where python's site-packages subdirectory lives
38    python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
39    # Install as a standard python package in /usr/lib64 if available, else in /usr/lib
40    if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):
41       sys_dir_packages =  prefix+"/lib64/"+python_version+"/site-packages/esys"
42       sys_dir_libraries = prefix+"/lib64"
43    else:
44       sys_dir_packages =  prefix+"/lib/"+python_version+"/site-packages/esys"
45       sys_dir_libraries = prefix+"/lib"
46    
47    sys_dir_examples = prefix+"/share/doc/esys"
48    
49    source_root = Dir('#.').abspath
50    
51    dir_packages = os.path.join(source_root,"esys")
52    dir_examples = os.path.join(source_root,"examples")
53    dir_libraries = os.path.join(source_root,"lib")
54    
55    print "Source root is : ",source_root
56    print " Default packages local installation:    ", dir_packages
57    print " Default library local installation  ", dir_libraries
58    print " Default example local  installation:    ", dir_examples
59    print "Install prefix is: ", prefix
60    print " Default packages system installation:   ", sys_dir_packages
61    print " Default library system installation     ", sys_dir_libraries
62    print " Default example system installation:    ", sys_dir_examples
63    
64    #==============================================================================================    
65    
66  # Default options and options help text  # Default options and options help text
67  # These are defaults and can be overridden using command line arguments or an options file.  # These are defaults and can be overridden using command line arguments or an options file.
68  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used
69  # DO NOT CHANGE THEM HERE  # DO NOT CHANGE THEM HERE
70  if ARGUMENTS.get('options_file',0):  # Where to install?
71     options_file = ARGUMENTS.get('options_file',0)  #==============================================================================================    
72  else:  #    
73    #    get the options file if present:
74    #
75    options_file = ARGUMENTS.get('options_file','')
76    
77    if not os.path.isfile(options_file) :
78        options_file = False
79    
80    if not options_file :
81     import socket     import socket
82     from string import ascii_letters,digits     hostname = re.sub("[^0-9a-zA-Z]", "_", socket.gethostname().split('.')[0])
83     hostname=""     tmp = os.path.join("scons",hostname+"_options.py")
84     for s in socket.gethostname().split('.')[0]:  
85        if s in ascii_letters+digits:     if os.path.isfile(tmp) :
86           hostname+=s        options_file = tmp
87        else:  
88           hostname+="_"  IS_WINDOWS_PLATFORM = (os.name== "nt")
    options_file = "scons/"+hostname+"_options.py"  
89    
90    # If you're not going to tell me then......
91    # FIXME: add one for the altix too.
92    if not options_file :
93       if IS_WINDOWS_PLATFORM :
94          options_file = "scons/windows_mscv71_options.py"
95       else:
96          options_file = "scons/linux_gcc_eg_options.py"
97    
98    # and load it
99  opts = Options(options_file, ARGUMENTS)  opts = Options(options_file, ARGUMENTS)
100    #================================================================
101    #
102    #   check if UMFPACK is installed on the system:
103    #
104    uf_root=None
105    for i in [ 'UMFPACK', 'umfpack', 'ufsparse', 'UFSPARSE']:
106       if os.path.isdir(os.path.join(tools_prefix,'include',i)):
107           uf_root=i
108           print i," is used form ",tools_prefix
109           break
110    if not uf_root==None:
111       umf_path_default=os.path.join(tools_prefix,'include',uf_root)
112       umf_lib_path_default=os.path.join(tools_prefix,'lib')
113       umf_libs_default=['umfpack']
114       amd_path_default=os.path.join(tools_prefix,'include',uf_root)
115       amd_lib_path_default=os.path.join(tools_prefix,'lib')
116       amd_libs_default=['amd']
117       ufc_path_default=os.path.join(tools_prefix,'include',uf_root)
118    else:
119       umf_path_default=None
120       umf_lib_path_default=None
121       umf_libs_default=None
122       amd_path_default=None
123       amd_lib_path_default=None
124       amd_libs_default=None
125       ufc_path_default=None
126    #
127    #==========================================================================
128    #
129    #    python installation:
130    #
131    python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))
132    python_lib_path_default=os.path.join(tools_prefix,'lib')
133    python_lib_default="python%s.%s"%(sys.version_info[0],sys.version_info[1])
134    
135    #==========================================================================
136    #
137    #    boost installation:
138    #
139    boost_path_default=os.path.join(tools_prefix,'include')
140    boost_lib_path_default=os.path.join(tools_prefix,'lib')
141    boost_lib_default=['boost_python']
142    
143    #==========================================================================
144    #
145    #    check if netCDF is installed on the system:
146    #
147    netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')
148    netCDF_lib_path_default=os.path.join(tools_prefix,'lib')
149    
150    if os.path.isdir(netCDF_path_default) and os.path.isdir(netCDF_lib_path_default):
151         useNetCDF_default='yes'
152         netCDF_libs_default=[ 'netcdf_c++', 'netcdf' ]
153    else:
154         useNetCDF_default='no'
155         netCDF_path_default=None
156         netCDF_lib_path_default=None
157         netCDF_libs_default=None
158    
159    #==========================================================================
160    #
161    #  MPI:
162    #
163    if IS_WINDOWS_PLATFORM:
164       useMPI_default='no'
165       mpi_path_default=None
166       mpi_lib_path_default=None
167       mpi_libs_default=[]
168       mpi_run_default=None
169    else:
170       useMPI_default='no'
171       mpi_root='/usr/local'
172       mpi_path_default=os.path.join(mpi_root,'include')
173       mpi_lib_path_default=os.path.join(mpi_root,'lib')
174       mpi_libs_default=[ 'mpich' , 'pthread', 'rt' ]
175       mpi_run_default='mpiexec -np 1'
176    #
177    #==========================================================================
178    #
179    #    compile:
180    #
181    cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi'
182    cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi'
183    cxx_flags_default='--no-warn -ansi'
184    cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
185    
186    #==============================================================================================    
187    # Default options and options help text
188    # These are defaults and can be overridden using command line arguments or an options file.
189    # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used
190    # DO NOT CHANGE THEM HERE
191  opts.AddOptions(  opts.AddOptions(
192  # Where to install esys stuff  # Where to install esys stuff
193    ('incinstall', 'where the esys headers will be installed', Dir('#.').abspath+'/include'),    ('incinstall', 'where the esys headers will be installed',             Dir('#.').abspath+'/include'),
194    ('libinstall', 'where the esys libraries will be installed', Dir('#.').abspath+'/lib'),    ('libinstall', 'where the esys libraries will be installed',           dir_libraries),
195    ('pyinstall', 'where the esys python modules will be installed', Dir('#.').abspath),    ('pyinstall', 'where the esys python modules will be installed',       dir_packages),
196      ('exinstall', 'where the esys examples will be installed',             dir_examples),
197      ('sys_libinstall', 'where the system esys libraries will be installed',       sys_dir_libraries),
198      ('sys_pyinstall', 'where the system esys python modules will be installed',   sys_dir_packages),
199      ('sys_exinstall', 'where the system esys examples will be installed',         sys_dir_examples),
200      ('src_zipfile', 'the source zip file will be installed.',              Dir('#.').abspath+"/release/escript_src.zip"),
201      ('test_zipfile', 'the test zip file will be installed.',               Dir('#.').abspath+"/release/escript_tests.zip"),
202      ('src_tarfile', 'the source tar file will be installed.',              Dir('#.').abspath+"/release/escript_src.tar.gz"),
203      ('test_tarfile', 'the test tar file will be installed.',               Dir('#.').abspath+"/release/escript_tests.tar.gz"),
204      ('examples_tarfile', 'the examples tar file will be installed.',       Dir('#.').abspath+"/release/doc/escript_examples.tar.gz"),
205      ('examples_zipfile', 'the examples zip file will be installed.',       Dir('#.').abspath+"/release/doc/escript_examples.zip"),
206      ('guide_pdf', 'name of the user guide in pdf format',                  Dir('#.').abspath+"/release/doc/user/guide.pdf"),
207      ('api_epydoc', 'name of the epydoc api docs directory',                Dir('#.').abspath+"/release/doc/epydoc"),
208      ('guide_html', 'name of the directory for user guide in html format',  Dir('#.').abspath+"/release/doc/user/html"),
209      ('api_doxygen', 'name of the doxygen api docs directory',prefix+"/release/doc/doxygen"),
210  # Compilation options  # Compilation options
211    BoolOption('dodebug', 'Do you want a debug build?', 'yes'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
212    ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/hostname_options.py)", options_file),    BoolOption('bounds_check', 'Do you want extra array bounds checking?', 'no'),
213      ('options_file', "Optional file containing preferred options. Ignored if it doesn't exist (default: scons/<hostname>_options.py)", options_file),
214    ('cc_defines','C/C++ defines to use', None),    ('cc_defines','C/C++ defines to use', None),
215    ('cc_flags','C compiler flags to use (Release build)', None),    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),
216    ('cc_flags_debug', 'C compiler flags to use (Debug build)', None),    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),
217    ('cxx_flags', 'C++ compiler flags to use (Release build)', None),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
218    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', None),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),
219      ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),
220      ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),
221    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
222    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
223      ('tar_flags','flags for zip files','-c -z'),
224  # MKL  # MKL
225    PathOption('mkl_path', 'Path to MKL includes', None),    PathOption('mkl_path', 'Path to MKL includes', None),
226    PathOption('mkl_lib_path', 'Path to MKL libs', None),    PathOption('mkl_lib_path', 'Path to MKL libs', None),
227    ('mkl_libs', 'MKL libraries to link with', None),    ('mkl_libs', 'MKL libraries to link with', None),
228  # SCSL  # SCSL
229    PathOption('scsl_path', 'Path to SCSL includes', None),    PathOption('scsl_path', 'Path to SCSL includes', None),
230    PathOption('scsl_lib_path', 'Path to SCSL libs', None),    PathOption('scsl_lib_path', 'Path to SCSL libs', None),
231    ('scsl_libs', 'SCSL libraries to link with', None),    ('scsl_libs', 'SCSL libraries to link with', None),
232  # UMFPACK    ('scsl_libs_MPI', 'SCSL libraries to link with for MPI build', None),
233    PathOption('umf_path', 'Path to UMF includes', None),  # UMFPACK
234    PathOption('umf_lib_path', 'Path to UMF libs', None),    PathOption('ufc_path', 'Path to UFconfig includes', ufc_path_default),
235    ('umf_libs', 'UMF libraries to link with', None),    PathOption('umf_path', 'Path to UMFPACK includes', umf_path_default),
236      PathOption('umf_lib_path', 'Path to UMFPACK libs', umf_lib_path_default),
237      ('umf_libs', 'UMFPACK libraries to link with', umf_libs_default),
238    # AMD (used by UMFPACK)
239      PathOption('amd_path', 'Path to AMD includes', amd_path_default),
240      PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
241      ('amd_libs', 'AMD libraries to link with', amd_libs_default),
242    # TRILINOS
243      PathOption('trilinos_path', 'Path to TRILINOS includes', None),
244      PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),
245      ('trilinos_libs', 'TRILINOS libraries to link with', None),
246    # BLAS
247      PathOption('blas_path', 'Path to BLAS includes', None),
248      PathOption('blas_lib_path', 'Path to BLAS libs', None),
249      ('blas_libs', 'BLAS libraries to link with', None),
250    # netCDF
251      ('useNetCDF', 'switch on/off the usage of netCDF', useNetCDF_default),
252      PathOption('netCDF_path', 'Path to netCDF includes', netCDF_path_default),
253      PathOption('netCDF_lib_path', 'Path to netCDF libs', netCDF_lib_path_default),
254      ('netCDF_libs', 'netCDF C++ libraries to link with', netCDF_libs_default),
255  # Python  # Python
256  # locations of include files for python  # locations of include files for python
257    PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),  # FIXME: python_path should be python_inc_path and the same for boost etc.
258    PathOption('python_lib_path', 'Path to Python libs', '/usr/lib'),    PathOption('python_path', 'Path to Python includes', python_path_default),
259    ('python_lib', 'Python libraries to link with', ["python%s.%s"%(sys.version_info[0],sys.version_info[1]),]),    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),
260      ('python_lib', 'Python libraries to link with', python_lib_default),
261      ('python_cmd', 'Python command', 'python'),
262  # Boost  # Boost
263    PathOption('boost_path', 'Path to Boost includes', '/usr/include'),    PathOption('boost_path', 'Path to Boost includes', boost_path_default),
264    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),    PathOption('boost_lib_path', 'Path to Boost libs', boost_lib_path_default),
265    ('boost_lib', 'Boost libraries to link with', ['boost_python',]),    ('boost_lib', 'Boost libraries to link with', boost_lib_default),
 # CppUnit  
   PathOption('cppunit_path', 'Path to CppUnit includes', Dir('#.').abspath+'/tools/CppUnitTest/inc'),  
   PathOption('cppunit_lib_path', 'Path to CppUnit libs', Dir('#.').abspath+'/lib'),  
   ('cppunit_lib', 'CppUnit libraries to link with', ['CppUnitTest',]),  
266  # Doc building  # Doc building
267    PathOption('doxygen_path', 'Path to Doxygen executable', None),  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),
268    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),  
269  # PAPI  # PAPI
270    PathOption('papi_path', 'Path to PAPI includes', None),    PathOption('papi_path', 'Path to PAPI includes', None),
271    PathOption('papi_lib_path', 'Path to PAPI libs', None),    PathOption('papi_lib_path', 'Path to PAPI libs', None),
272    ('papi_libs', 'PAPI libraries to link with', None),    ('papi_libs', 'PAPI libraries to link with', None),
273      ('papi_instrument_solver', 'use PAPI in Solver.c to instrument each iteration of the solver', None),
274    # MPI
275      BoolOption('useMPI', 'Compile parallel version using MPI', useMPI_default),
276      ('MPICH_IGNORE_CXX_SEEK', 'name of macro to ignore MPI settings of C++ SEEK macro (for MPICH)' , 'MPICH_IGNORE_CXX_SEEK'),
277      PathOption('mpi_path', 'Path to MPI includes', mpi_path_default),
278      ('mpi_run', 'mpirun name' , mpi_run_default),
279      PathOption('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)',mpi_lib_path_default),
280      ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', mpi_libs_default)
281  )  )
282    #=================================================================================================
283    #
284    #   Note: On the Altix the intel compilers are not automatically
285    #   detected by scons intelc.py script. The Altix has a different directory
286    #   path and in some locations the "modules" facility is used to support
287    #   multiple compiler versions. This forces the need to import the users PATH
288    #   environment which isn't the "scons way"
289    #   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)
290    #   FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix
291    #
292    
293    if IS_WINDOWS_PLATFORM:
294          env = Environment(tools = ['default', 'msvc'], options = opts)
295    else:
296       if os.uname()[4]=='ia64':
297          env = Environment(tools = ['default', 'intelc'], options = opts)
298          if env['CXX'] == 'icpc':
299             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
300       else:
301          env = Environment(tools = ['default'], options = opts)
302    Help(opts.GenerateHelpText(env))
303    
304    if env['bounds_check']:
305       env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])
306       env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])
307       bounds_check = env['bounds_check']
308    else:
309       bounds_check = 0
310    
311    #=================================================================================================
312    #
313    #     Initialise Scons Build Environment
314    #     check for user environment variables we are interested in
315    try:
316       tmp = os.environ['PYTHONPATH']
317       env['ENV']['PYTHONPATH'] = tmp
318    except KeyError:
319       pass
320    
321    env.PrependENVPath('PYTHONPATH', source_root)
322    
 # Initialise Scons Build Environment  
 # check for user environment variables we are interested in  
323  try:  try:
324     python_path = os.environ['PYTHONPATH']     omp_num_threads = os.environ['OMP_NUM_THREADS']
325  except KeyError:  except KeyError:
326     python_path = ''     omp_num_threads = 1
327    env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
328    
329  try:  try:
330     path = os.environ['PATH']     path = os.environ['PATH']
331       env['ENV']['PATH'] = path
332  except KeyError:  except KeyError:
333     path = ''     omp_num_threads = 1
334    
335    env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
336    
337    
338    # Copy some variables from the system environment to the build environment
339  try:  try:
340     ld_library_path = os.environ['LD_LIBRARY_PATH']     env['ENV']['DISPLAY'] = os.environ['DISPLAY']
341       env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']
342       home_temp = os.environ['HOME']   # MPICH2's mpd needs $HOME to find $HOME/.mpd.conf
343       env['ENV']['HOME'] = home_temp
344  except KeyError:  except KeyError:
345     ld_library_path = ''     pass
   
 # Note: On the Altix the intel compilers are not automatically  
 # detected by scons intelc.py script. The Altix has a different directory  
 # path and in some locations the "modules" facility is used to support  
 # multiple compiler versions. This forces the need to import the users PATH  
 # environment which isn't the "scons way"  
 # 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)  
 # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix  
   
 if os.name != "nt" and os.uname()[4]=='ia64':  
    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  
    if env['CXX'] == 'icpc':  
       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  
 elif os.name == "nt":  
    # FIXME: Need to implement equivalent of ld library path for windoze  
    env = Environment(tools = ['default', 'intelc'], options = opts)  
    env['ENV']['PYTHONPATH'] = python_path  
 else:  
    env = Environment(tools = ['default'], options = opts)  
    env['ENV']['PATH'] = path  
    env['ENV']['LD_LIBRARY_PATH'] = ld_library_path  
    env['ENV']['PYTHONPATH'] = python_path  
346    
347  # Setup help for options  try:
348  Help(opts.GenerateHelpText(env))     tmp = os.environ['PATH']
349       env['ENV']['PATH'] = tmp
350    except KeyError:
351       pass
352    
353  # Add some customer builders  try:
354       tmp = os.environ['LD_LIBRARY_PATH']
355       print tmp
356       env['ENV']['LD_LIBRARY_PATH'] = tmp
357    except KeyError:
358       pass
359    #==========================================================================
360    #
361    #    Add some customer builders
362    #
363  py_builder = Builder(action = scons_extensions.build_py, suffix = '.pyc', src_suffix = '.py', single_source=True)  py_builder = Builder(action = scons_extensions.build_py, suffix = '.pyc', src_suffix = '.py', single_source=True)
364  env.Append(BUILDERS = {'PyCompile' : py_builder});  env.Append(BUILDERS = {'PyCompile' : py_builder});
365    
366  if env['PLATFORM'] == "win32":  runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed',
367     runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', src_suffix='.exe', single_source=True)                                src_suffix=env['PROGSUFFIX'], single_source=True)
368  else:  
    runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', single_source=True)  
369  env.Append(BUILDERS = {'RunUnitTest' : runUnitTest_builder});  env.Append(BUILDERS = {'RunUnitTest' : runUnitTest_builder});
370    
371  runPyUnitTest_builder = Builder(action = scons_extensions.runPyUnitTest, suffix = '.passed', src_suffic='.py', single_source=True)  runPyUnitTest_builder = Builder(action = scons_extensions.runPyUnitTest, suffix = '.passed', src_suffic='.py', single_source=True)
# Line 149  try: Line 376  try:
376     incinstall = env['incinstall']     incinstall = env['incinstall']
377     env.Append(CPPPATH = [incinstall,])     env.Append(CPPPATH = [incinstall,])
378  except KeyError:  except KeyError:
379     incinstall = None       incinstall = None
380  try:  try:
381     libinstall = env['libinstall']     libinstall = env['libinstall']
382     env.Append(LIBPATH = [libinstall,])     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so
383     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
384       if IS_WINDOWS_PLATFORM :
385          env.PrependENVPath('PATH', libinstall)
386          env.PrependENVPath('PATH', env['boost_lib_path'])
387  except KeyError:  except KeyError:
388     libinstall = None       libinstall = None
389  try:  try:
390     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'] # all targets will install into pyinstall/esys but PYTHONPATH points at straight pyinstall so you go import esys.escript etc
    env.PrependENVPath('PYTHONPATH', env['pyinstall'])  
391  except KeyError:  except KeyError:
392     pyinstall = None       pyinstall = None
393    
394  try:  try:
395     dodebug = env['dodebug']     cc_defines = env['cc_defines']
396       env.Append(CPPDEFINES = cc_defines)
397  except KeyError:  except KeyError:
398     dodebug = None       pass
399  try:  try:
400     cc_defines = env['cc_defines']     flags = env['ar_flags']
401     env.Append(CPPDEFINES = [cc_defines,])     env.Append(ARFLAGS = flags)
402    except KeyError:
403       ar_flags = None
404    try:
405       sys_libs = env['sys_libs']
406    except KeyError:
407       sys_libs = []
408    
409    try:
410       tar_flags = env['tar_flags']
411       env.Replace(TARFLAGS = tar_flags)
412  except KeyError:  except KeyError:
413     pass     pass
414    
415    try:
416       exinstall = env['exinstall']
417    except KeyError:
418       exinstall = None
419    try:
420       sys_libinstall = env['sys_libinstall']
421    except KeyError:
422       sys_libinstall = None
423    try:
424       sys_pyinstall = env['sys_pyinstall']
425    except KeyError:
426       sys_pyinstall = None
427    try:
428       sys_exinstall = env['sys_exinstall']
429    except KeyError:
430       sys_exinstall = None
431    
432    # ====================== debugging ===================================
433    try:
434       dodebug = env['dodebug']
435    except KeyError:
436       dodebug = None
437    
438    # === switch on omp ===================================================
439    try:
440      omp_flags = env['omp_flags']
441    except KeyError:
442      omp_flags = ''
443    
444    try:
445      omp_flags_debug = env['omp_flags_debug']
446    except KeyError:
447      omp_flags_debug = ''
448    
449    # ========= use mpi? =====================================================
450    try:
451       useMPI = env['useMPI']
452    except KeyError:
453       useMPI = None
454    # ========= set compiler flags ===========================================
455    
456  if dodebug:  if dodebug:
457        try:
458          flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
459          env.Append(CCFLAGS = flags)
460        except KeyError:
461          pass
462    else:
463     try:     try:
464        flags = env['cc_flags_debug']        flags = env['cc_flags'] + ' ' + omp_flags
465        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
466     except KeyError:     except KeyError:
467        pass        pass
468    if dodebug:
469         try:
470            flags = env['cxx_flags_debug']
471            env.Append(CXXFLAGS = flags)
472         except KeyError:
473            pass
474  else:  else:
475         try:
476            flags = env['cxx_flags']
477            env.Append(CXXFLAGS = flags)
478         except KeyError:
479            pass
480    try:
481         if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
482    except:
483         pass
484    
485    # ============= Remember what options were used in the compile =====================================
486    if not IS_WINDOWS_PLATFORM:
487      env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
488      if dodebug:       env.Execute("touch " + libinstall + "/Compiled.with.debug")
489      if useMPI:        env.Execute("touch " + libinstall + "/Compiled.with.mpi")
490      if omp_flags != '':   env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
491      if bounds_check:  env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
492    
493    # ============= set mkl (but only of no MPI) =====================================
494    if not useMPI:
495     try:     try:
496        flags = env['cc_flags']        includes = env['mkl_path']
497        env.Append(CCFLAGS = flags)        env.Append(CPPPATH = [includes,])
498     except KeyError:     except KeyError:
499        pass        pass
500    
 if dodebug:  
501     try:     try:
502        flags = env['cxx_flags_debug']        lib_path = env['mkl_lib_path']
503        env.Append(CXXFLAGS = flags)        env.Append(LIBPATH = [lib_path,])
504          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
505     except KeyError:     except KeyError:
506        pass        pass
507    
508       try:
509          mkl_libs = env['mkl_libs']
510       except KeyError:
511          mkl_libs = []
512  else:  else:
513         mkl_libs = []
514    
515    # ============= set scsl (but only of no MPI) =====================================
516    if not useMPI:
517     try:     try:
518        flags = env['cxx_flags']        includes = env['scsl_path']
519        env.Append(CXXFLAGS = flags)        env.Append(CPPPATH = [includes,])
520     except KeyError:     except KeyError:
521        pass        pass
522    
523  try:     try:
524     flags = env['ar_flags']        lib_path = env['scsl_lib_path']
525     env.Append(ARFLAGS = flags)        env.Append(LIBPATH = [lib_path,])
526  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
527     ar_flags = None       except KeyError:
528  try:        pass
529     sys_libs = env['sys_libs']    
530  except KeyError:     try:
531     sys_libs = ''        scsl_libs = env['scsl_libs']
532       except KeyError:
533          scsl_libs = [ ]
534    
535    else:
536        scsl_libs =  []
537    
538    # ============= set TRILINOS (but only with MPI) =====================================
539    if useMPI:
540       try:
541          includes = env['trilinos_path']
542          env.Append(CPPPATH = [includes,])
543       except KeyError:
544          pass
545    
546       try:
547          lib_path = env['trilinos_lib_path']
548          env.Append(LIBPATH = [lib_path,])
549       except KeyError:
550          pass
551    
552       try:
553          trilinos_libs = env['trilinos_libs']
554       except KeyError:
555          trilinos_libs = []
556    else:
557         trilinos_libs = []
558    
559    
560    # ============= set umfpack (but only without MPI) =====================================
561    umf_libs=[ ]
562    if not useMPI:
563       try:
564          includes = env['umf_path']
565          env.Append(CPPPATH = [includes,])
566       except KeyError:
567          pass
568    
569       try:
570          lib_path = env['umf_lib_path']
571          env.Append(LIBPATH = [lib_path,])
572       except KeyError:
573          pass
574    
575       try:
576          umf_libs = env['umf_libs']
577          umf_libs+=umf_libs
578       except KeyError:
579          pass
580    
581       try:
582          includes = env['ufc_path']
583          env.Append(CPPPATH = [includes,])
584       except KeyError:
585          pass
586    
587       try:
588          includes = env['amd_path']
589          env.Append(CPPPATH = [includes,])
590       except KeyError:
591          pass
592    
593       try:
594          lib_path = env['amd_lib_path']
595          env.Append(LIBPATH = [lib_path,])
596       except KeyError:
597          pass
598    
599       try:
600          amd_libs = env['amd_libs']
601          umf_libs+=amd_libs
602       except KeyError:
603          pass
604    
605    # ============= set TRILINOS (but only with MPI) =====================================
606    if useMPI:
607       try:
608          includes = env['trilinos_path']
609          env.Append(CPPPATH = [includes,])
610       except KeyError:
611          pass
612    
613       try:
614          lib_path = env['trilinos_lib_path']
615          env.Append(LIBPATH = [lib_path,])
616       except KeyError:
617          pass
618    
619       try:
620          trilinos_libs = env['trilinos_libs']
621       except KeyError:
622          trilinos_libs = []
623    else:
624         trilinos_libs = []
625    
626    # ============= set blas =====================================
627  try:  try:
628     includes = env['mkl_path']     includes = env['blas_path']
629     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
630  except KeyError:  except KeyError:
631     pass     pass
632    
633  try:  try:
634     lib_path = env['mkl_lib_path']     lib_path = env['blas_lib_path']
635     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
636  except KeyError:  except KeyError:
637     pass     pass
638    
639  try:  try:
640     mkl_libs = env['mkl_libs']     blas_libs = env['blas_libs']
641  except KeyError:  except KeyError:
642     mkl_libs = ''     blas_libs = [ ]
643    
644    # ========== netcdf ====================================
645    try:
646       useNetCDF = env['useNetCDF']
647    except KeyError:
648       useNetCDF = 'yes'
649       pass
650        
651    if useNetCDF == 'yes':
652       try:
653          netCDF_libs = env['netCDF_libs']
654       except KeyError:
655          pass
656    
657       env.Append(LIBS = netCDF_libs)
658       env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
659       try:
660          includes = env['netCDF_path']
661          env.Append(CPPPATH = [includes,])
662       except KeyError:
663          pass
664    
665       try:
666          lib_path = env['netCDF_lib_path']
667          env.Append(LIBPATH = [ lib_path, ])
668          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
669          if IS_WINDOWS_PLATFORM :
670             env.PrependENVPath('PATH', lib_path)
671       except KeyError:
672          pass
673    else:
674       print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."
675       netCDF_libs=[ ]
676    
677    # ====================== boost ======================================
678  try:  try:
679     includes = env['scsl_path']     includes = env['boost_path']
680     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
681  except KeyError:  except KeyError:
682     pass     pass
683  try:  try:
684     lib_path = env['scsl_lib_path']     lib_path = env['boost_lib_path']
685     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
686       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
687       if IS_WINDOWS_PLATFORM :
688          env.PrependENVPath('PATH', lib_path)
689  except KeyError:  except KeyError:
690     pass     pass
691  try:  try:
692     scsl_libs = env['scsl_libs']     boost_lib = env['boost_lib']
693  except KeyError:  except KeyError:
694     scsl_libs = ''     boost_lib = None
695    # ====================== python ======================================
696  try:  try:
697     includes = env['umf_path']     includes = env['python_path']
698     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
699  except KeyError:  except KeyError:
700     pass     pass
701  try:  try:
702     lib_path = env['umf_lib_path']     lib_path = env['python_lib_path']
703       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
704     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
705  except KeyError:  except KeyError:
706     pass     pass
707  try:  try:
708     umf_libs = env['umf_libs']     python_lib = env['python_lib']
 except KeyError:  
    umf_libs = ''  
 try:  
    includes = env['boost_path']  
    env.Append(CPPPATH = [includes,])  
709  except KeyError:  except KeyError:
710     pass     python_lib = None
711    # =============== documentation =======================================
712  try:  try:
713     lib_path = env['boost_lib_path']     doxygen_path = env['doxygen_path']
    env.Append(LIBPATH = [lib_path,])  
714  except KeyError:  except KeyError:
715     pass     doxygen_path = None
716  try:  try:
717     boost_lib = env['boost_lib']     epydoc_path = env['epydoc_path']
718  except KeyError:  except KeyError:
719     boost_lib = None       epydoc_path = None
720    # =============== PAPI =======================================
721  try:  try:
722     includes = env['cppunit_path']     includes = env['papi_path']
723     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
724  except KeyError:  except KeyError:
725     pass     pass
726  try:  try:
727     lib_path = env['cppunit_lib_path']     lib_path = env['papi_lib_path']
728     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
729  except KeyError:  except KeyError:
730     pass     pass
731  try:  try:
732     cppunit_lib = env['cppunit_lib']     papi_libs = env['papi_libs']
733  except KeyError:  except KeyError:
734     boost_lib = None       papi_libs = None
735    # ============= set mpi =====================================
736    if useMPI:
737       env.Append(CPPDEFINES=['PASO_MPI',])
738       try:
739          includes = env['mpi_path']
740          env.Append(CPPPATH = [includes,])
741       except KeyError:
742          pass
743       try:
744          lib_path = env['mpi_lib_path']
745          env.Append(LIBPATH = [lib_path,])
746          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
747       except KeyError:
748          pass
749       try:
750          mpi_libs = env['mpi_libs']
751       except KeyError:
752          mpi_libs = []
753    
754       try:
755          mpi_run = env['mpi_run']
756       except KeyError:
757          mpi_run = ''
758    
759       try:
760           mpich_ignore_cxx_seek=env['MPICH_IGNORE_CXX_SEEK']
761           env.Append(CPPDEFINES = [ mpich_ignore_cxx_seek ] )
762       except KeyError:
763          pass
764    else:
765      mpi_libs=[]
766      mpi_run = mpi_run_default
767    # =========== zip files ===========================================
768  try:  try:
769     includes = env['python_path']     includes = env['papi_path']
770     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
771  except KeyError:  except KeyError:
772     pass     pass
773  try:  try:
774     lib_path = env['python_lib_path']     lib_path = env['papi_lib_path']
775     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
776  except KeyError:  except KeyError:
777     pass     pass
778  try:  try:
779     python_lib = env['python_lib']     papi_libs = env['papi_libs']
780  except KeyError:  except KeyError:
781     python_lib = None       papi_libs = None
782    try:
783       papi_instrument_solver = env['papi_instrument_solver']
784    except KeyError:
785       papi_instrument_solver = None
786    
787    
788    # ============= and some helpers =====================================
789  try:  try:
790     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
791  except KeyError:  except KeyError:
792     doxygen_path = None       doxygen_path = None
793  try:  try:
794     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
795  except KeyError:  except KeyError:
796     epydoc_path = None       epydoc_path = None
797  try:  try:
798     epydoc_pythonpath = env['epydoc_pythonpath']     src_zipfile = env.File(env['src_zipfile'])
799  except KeyError:  except KeyError:
800     epydoc_pythonpath = None       src_zipfile = None
801  try:  try:
802     includes = env['papi_path']     test_zipfile = env.File(env['test_zipfile'])
    env.Append(CPPPATH = [includes,])  
803  except KeyError:  except KeyError:
804     pass     test_zipfile = None
805  try:  try:
806     lib_path = env['papi_lib_path']     examples_zipfile = env.File(env['examples_zipfile'])
    env.Append(LIBPATH = [lib_path,])  
807  except KeyError:  except KeyError:
808     pass     examples_zipfile = None
809    
810  try:  try:
811     papi_libs = env['papi_libs']     src_tarfile = env.File(env['src_tarfile'])
812    except KeyError:
813       src_tarfile = None
814    try:
815       test_tarfile = env.File(env['test_tarfile'])
816    except KeyError:
817       test_tarfile = None
818    try:
819       examples_tarfile = env.File(env['examples_tarfile'])
820    except KeyError:
821       examples_tarfile = None
822    
823    try:
824       guide_pdf = env.File(env['guide_pdf'])
825    except KeyError:
826       guide_pdf = None
827    
828    try:
829       guide_html_index = env.File('index.htm',env['guide_html'])
830    except KeyError:
831       guide_html_index = None
832    
833    try:
834       api_epydoc = env.Dir(env['api_epydoc'])
835    except KeyError:
836       api_epydoc = None
837    
838    try:
839       api_doxygen = env.Dir(env['api_doxygen'])
840  except KeyError:  except KeyError:
841     papi_libs = None       api_doxygen = None
842    
843  # Targets  try:
844  env.Default(libinstall)     svn_pipe = os.popen("svnversion -n .")
845  env.Default(incinstall)     global_revision = svn_pipe.readlines()
846  env.Default(pyinstall)     svn_pipe.close()
847  env.Alias('build_tests')     global_revision = re.sub(":.*", "", global_revision[0])
848  env.Alias('run_tests')     global_revision = re.sub("[^0-9]", "", global_revision)
849  env.Alias('py_tests')  except:
850  env.Alias('all_tests', ['run_tests', 'py_tests'])     global_revision="-1"
851       print "Warning: unable to recover global revsion number."
852    if global_revision == "": global_revision="0"
853    print "Revision number is %s."%global_revision
854    env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
855    
856  # Python install - esys __init__.py  # Python install - esys __init__.py
857  # 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'))
858  # create the file if it doesn't exist  
859  env.Command('esys/__init__.py', None, 'touch $TARGET')  # FIXME: exinstall and friends related to examples are not working.
860    build_target = env.Alias('build',[libinstall,incinstall,pyinstall,init_target])
861    
862    env.Default(build_target)
863    
864    # Zipgets
865    env.Alias('release_src',[ src_zipfile, src_tarfile ])
866    env.Alias('release_tests',[ test_zipfile, test_tarfile])
867    env.Alias('release_examples',[ examples_zipfile, examples_tarfile])
868    env.Alias('examples_zipfile',examples_zipfile)
869    env.Alias('examples_tarfile',examples_tarfile)
870    env.Alias('api_epydoc',api_epydoc)
871    env.Alias('api_doxygen',api_doxygen)
872    env.Alias('guide_html_index',guide_html_index)
873    env.Alias('guide_pdf', guide_pdf)
874    env.Alias('docs',[ 'release_examples', 'guide_pdf', api_epydoc, api_doxygen, guide_html_index])
875    env.Alias('release', ['release_src', 'release_tests', 'docs'])
876    
877    env.Alias('build_tests',build_target)    # target to build all C++ tests
878    env.Alias('build_py_tests',build_target) # target to build all python tests
879    env.Alias('build_all_tests', [ 'build_tests', 'build_py_tests' ] ) # target to build all python tests
880    env.Alias('run_tests', 'build_tests')   # target to run all C++ test
881    env.Alias('py_tests', 'build_py_tests') # taget to run all released python tests
882    env.Alias('all_tests', ['run_tests', 'py_tests']) # target to run all C++ and released python tests
883    
884    
885  # Allow sconscripts to see the env  # Allow sconscripts to see the env
886  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs",  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "blas_libs", "netCDF_libs", "useNetCDF", "mpi_run",
887      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "epydoc_pythonpath", "papi_libs", "cppunit_lib", "sys_libs" ])      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
888            "sys_libs", "test_zipfile", "src_zipfile", "test_tarfile", "src_tarfile", "examples_tarfile", "examples_zipfile", "trilinos_libs", "mpi_libs", "papi_instrument_solver",
889            "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI" ])
890    
891  # End initialisation section  # End initialisation section
892  # Begin configuration section  # Begin configuration section
893    # adds this file and the scons option directore to the source tar
894    release_srcfiles=[env.File('SConstruct'),env.Dir('lib'),env.Dir('include'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]
895    release_testfiles=[env.File('README_TESTS'),]
896    env.Zip(src_zipfile, release_srcfiles)
897    env.Zip(test_zipfile, release_testfiles)
898    try:
899       env.Tar(src_tarfile, release_srcfiles)
900       env.Tar(test_tarfile, release_testfiles)
901    except AttributeError:
902       pass
903  # Insert new components to be build here  # Insert new components to be build here
904  # FIXME: might be nice to replace this verbosity with a list of targets and some  # FIXME: might be nice to replace this verbosity with a list of targets and some
905  # FIXME: nifty python to create the lengthy but very similar env.Sconscript lines  # FIXME: nifty python to create the lengthy but very similar env.Sconscript lines
# Line 344  Export(["env", "incinstall", "libinstall Line 907  Export(["env", "incinstall", "libinstall
907  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)
908  # C/C++ Libraries  # C/C++ Libraries
909  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
910  env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)  # bruce is removed for now as it doesn't really do anything
911    # env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)
912  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
913  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
914  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
915  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)
916    env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
917    env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)
918    env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)
919    env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)
920    #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)
921    
922    
923    syslib_install_target = env.installDirectory(sys_libinstall,libinstall)
924    syspy_install_target = env.installDirectory(sys_pyinstall,pyinstall,recursive=True)
925    
926  # FIXME:need to be incorporated into build system  install_target = env.Alias("install", env.Flatten([syslib_install_target, syspy_install_target]) )
 # FIXME: 'pyvisi/SConstruct']  
 # FIXME: 'doc/SConstruct']  
 # FIXME: 'doc/SConstruct']  

Legend:
Removed from v.688  
changed lines
  Added in v.1416

  ViewVC Help
Powered by ViewVC 1.1.26