/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1232 by phornby, Fri Aug 10 06:44:04 2007 UTC revision 1634 by phornby, Sat Jul 12 09:08:33 2008 UTC
# Line 15  EnsurePythonVersion(2,3) Line 15  EnsurePythonVersion(2,3)
15  #===============================================================  #===============================================================
16  #   import tools:  #   import tools:
17  import glob  import glob
18  import sys, os  import sys, os, re
 import socket  
19  # Add our extensions  # Add our extensions
20  if sys.path.count('scons')==0: sys.path.append('scons')  if sys.path.count('scons')==0: sys.path.append('scons')
21  import scons_extensions  import scons_extensions
22    
23    # We may also need to know where python's site-packages subdirectory lives
24    python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
25    
26  #===============================================================  #===============================================================
27    
28  tools_prefix="/usr"  tools_prefix="/usr"
# Line 29  tools_prefix="/usr" Line 31  tools_prefix="/usr"
31  #      #    
32  #    get the installation prefix  #    get the installation prefix
33  #  #
34  prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)  prefix = ARGUMENTS.get('prefix', sys.prefix )
35    
36  # We may also need to know where python's site-packages subdirectory lives  # We may also need to know where python's site-packages subdirectory lives
37  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])  python_version = 'python%s.%s'%(sys.version_info[0],sys.version_info[1])
38    # Install as a standard python package in /usr/lib64 if available, else in /usr/lib
39  if prefix == "/usr":  if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):
40     # Install as a standard python package in /usr/lib64 if available, else in /usr/lib     sys_dir_packages =  prefix+"/lib64/"+python_version+"/site-packages/esys"
41     if os.path.isdir(  prefix+"/lib64/"+python_version+"/site-packages"):     sys_dir_libraries = prefix+"/lib64"
42        dir_packages =  prefix+"/lib64/"+python_version+"/site-packages"  else:
43        dir_libraries = prefix+"/lib64"     sys_dir_packages =  prefix+"/lib/"+python_version+"/site-packages/esys"
44     elif os.path.isdir(prefix+"/lib/"+python_version+"/site-packages"):     sys_dir_libraries = prefix+"/lib"
45        dir_packages =  prefix+"/lib/"+python_version+"/site-packages"  
46        dir_libraries = prefix+"/lib"  sys_dir_examples = prefix+"/share/doc/esys"
47     else:  
48        print "Install prefix is /usr but couldn't find python package directory in either"  source_root = Dir('#.').abspath
49        print "/usr/lib64/"+python_version+"/site-packages or /usr/lib/"+python_version+"/site-packages"  
50        sys.exit(1)  dir_packages = os.path.join(source_root,"esys")
51     dir_examples = prefix+"/share/doc/esys"  dir_examples = os.path.join(source_root,"examples")
52  else:  dir_libraries = os.path.join(source_root,"lib")
53     # Install using the usual escript directory structure  
54     dir_packages = prefix  print "Source root is : ",source_root
55     dir_libraries = prefix+"/lib"  print " Default packages local installation:    ", dir_packages
56     dir_examples = prefix  print " Default library local installation  ", dir_libraries
57  dir_packages += "/esys"  print " Default example local  installation:    ", dir_examples
 dir_examples += "/examples"  
   
58  print "Install prefix is: ", prefix  print "Install prefix is: ", prefix
59  print " python packages will be installed in:   ", dir_packages  print " Default packages system installation:   ", sys_dir_packages
60  print " libraries will be installed in:     ", dir_libraries  print " Default library system installation     ", sys_dir_libraries
61  print " examples will be installed in:      ", dir_examples  print " Default example system installation:    ", sys_dir_examples
62    
63  #==============================================================================================      #==============================================================================================    
64    
# Line 71  print "    examples will be installed in: Line 71  print "    examples will be installed in:
71  #      #    
72  #    get the options file if present:  #    get the options file if present:
73  #  #
74  if ARGUMENTS.get('options_file',0):  options_file = ARGUMENTS.get('options_file','')
75     options_file = ARGUMENTS.get('options_file',0)  
76  else:  if not os.path.isfile(options_file) :
77     from string import ascii_letters,digits      options_file = False
78     hostname=""  
79     for s in socket.gethostname().split('.')[0]:  if not options_file :
80        if s in ascii_letters+digits:     import socket
81           hostname+=s     hostname = re.sub("[^0-9a-zA-Z]", "_", socket.gethostname().split('.')[0])
82        else:     tmp = os.path.join("scons",hostname+"_options.py")
83           hostname+="_"  
84     options_file = os.path.join("scons",hostname+"_options.py")     if os.path.isfile(tmp) :
85            options_file = tmp
86  if os.path.isfile(options_file):  
87     print "option file is ",options_file,"."  IS_WINDOWS_PLATFORM = (os.name== "nt")
88  else:  
89     print "option file is ",options_file, "(not present)."  # If you're not going to tell me then......
90    # FIXME: add one for the altix too.
91    if not options_file :
92       if IS_WINDOWS_PLATFORM :
93          options_file = "scons/windows_mscv71_options.py"
94       else:
95          options_file = "scons/linux_gcc_eg_options.py"
96    
97  # and load it  # and load it
98  opts = Options(options_file, ARGUMENTS)  opts = Options(options_file, ARGUMENTS)
99  #================================================================  #================================================================
# Line 122  else: Line 129  else:
129  #  #
130  python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))  python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))
131  python_lib_path_default=os.path.join(tools_prefix,'lib')  python_lib_path_default=os.path.join(tools_prefix,'lib')
132  python_libs_default=["python%s.%s"%(sys.version_info[0],sys.version_info[1])]  python_lib_default="python%s.%s"%(sys.version_info[0],sys.version_info[1])
133    
134  #==========================================================================  #==========================================================================
135  #  #
136  #    boost installation:  #    boost installation:
137  #  #
138  boost_path_default=os.path.join(tools_prefix,'include')  boost_path_default=os.path.join(tools_prefix,'include')
139  boost_libs_path_default=os.path.join(tools_prefix,'lib')  boost_lib_path_default=os.path.join(tools_prefix,'lib')
140  boost_libs_default=['boost_python']  boost_lib_default=['boost_python']
141    
142  #==========================================================================  #==========================================================================
143  #  #
144  #    check if netCDF is installed on the system:  #    check if netCDF is installed on the system:
145  #  #
146  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')
147  netCDF_lib_path_default=os.path.join(tools_prefix,'lib','netcdf-3')  netCDF_lib_path_default=os.path.join(tools_prefix,'lib')
148    
149  if os.path.isdir(netCDF_path_default) and os.path.isdir(netCDF_lib_path_default):  if os.path.isdir(netCDF_path_default) and os.path.isdir(netCDF_lib_path_default):
150       useNetCDF_default='yes'       useNetCDF_default='yes'
# Line 149  else: Line 157  else:
157    
158  #==========================================================================  #==========================================================================
159  #  #
160    #  MPI:
161    #
162    if IS_WINDOWS_PLATFORM:
163       useMPI_default='no'
164       mpi_path_default=None
165       mpi_lib_path_default=None
166       mpi_libs_default=[]
167       mpi_run_default=None
168    else:
169       useMPI_default='no'
170       mpi_root='/usr/local'
171       mpi_path_default=os.path.join(mpi_root,'include')
172       mpi_lib_path_default=os.path.join(mpi_root,'lib')
173       mpi_libs_default=[ 'mpich' , 'pthread', 'rt' ]
174       mpi_run_default='mpiexec -np 1'
175    #
176    #==========================================================================
177    #
178  #    compile:  #    compile:
179  #  #
180  cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'  cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi'
181  cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'  cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi'
182  cxx_flags_default='--no-warn -ansi'  cxx_flags_default='--no-warn -ansi'
183  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
184    
185  #==============================================================================================      #==============================================================================================    
186  # Default options and options help text  # Default options and options help text
187  # 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.
# Line 166  opts.AddOptions( Line 193  opts.AddOptions(
193    ('libinstall', 'where the esys libraries will be installed',           dir_libraries),    ('libinstall', 'where the esys libraries will be installed',           dir_libraries),
194    ('pyinstall', 'where the esys python modules will be installed',       dir_packages),    ('pyinstall', 'where the esys python modules will be installed',       dir_packages),
195    ('exinstall', 'where the esys examples will be installed',             dir_examples),    ('exinstall', 'where the esys examples will be installed',             dir_examples),
196      ('sys_libinstall', 'where the system esys libraries will be installed',       sys_dir_libraries),
197      ('sys_pyinstall', 'where the system esys python modules will be installed',   sys_dir_packages),
198      ('sys_exinstall', 'where the system esys examples will be installed',         sys_dir_examples),
199    ('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"),
200    ('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"),
201    ('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"),
# Line 178  opts.AddOptions( Line 208  opts.AddOptions(
208    ('api_doxygen', 'name of the doxygen api docs directory',prefix+"/release/doc/doxygen"),    ('api_doxygen', 'name of the doxygen api docs directory',prefix+"/release/doc/doxygen"),
209  # Compilation options  # Compilation options
210    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
211      BoolOption('bounds_check', 'Do you want extra array bounds checking?', 'no'),
212    ('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),
213    ('cc_defines','C/C++ defines to use', None),    ('cc_defines','C/C++ defines to use', None),
214    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),
215    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),
216    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
217    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),
218      ('link_flags', 'Linker flags to use (Release build)', None),
219      ('link_flags_debug', 'Linker flags to use (Debug build)', None),
220    
221      ('omp_flags', 'OpenMP compiler flags to use (Release build)', ''),
222      ('omp_flags_debug', 'OpenMP compiler flags to use (Debug build)', ''),
223    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
224    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
225    ('tar_flags','flags for zip files','-c -z'),    ('tar_flags','flags for zip files','-c -z'),
# Line 205  opts.AddOptions( Line 241  opts.AddOptions(
241    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
242    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
243    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('amd_libs', 'AMD libraries to link with', amd_libs_default),
244    # ParMETIS
245      ('parmetis_path', 'Path to ParMETIS includes', ''),
246      ('parmetis_lib_path', 'Path to ParMETIS library', ''),
247      ('parmetis_lib', 'ParMETIS library to link with', []),
248    # TRILINOS
249      PathOption('trilinos_path', 'Path to TRILINOS includes', None),
250      PathOption('trilinos_lib_path', 'Path to TRILINOS libs', None),
251      ('trilinos_libs', 'TRILINOS libraries to link with', None),
252  # BLAS  # BLAS
253    PathOption('blas_path', 'Path to BLAS includes', None),    PathOption('blas_path', 'Path to BLAS includes', None),
254    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
# Line 216  opts.AddOptions( Line 260  opts.AddOptions(
260    ('netCDF_libs', 'netCDF C++ libraries to link with', netCDF_libs_default),    ('netCDF_libs', 'netCDF C++ libraries to link with', netCDF_libs_default),
261  # Python  # Python
262  # locations of include files for python  # locations of include files for python
263    # FIXME: python_path should be python_inc_path and the same for boost etc.
264    PathOption('python_path', 'Path to Python includes', python_path_default),    PathOption('python_path', 'Path to Python includes', python_path_default),
265    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),
266    ('python_libs', 'Python libraries to link with', python_libs_default),    ('python_lib', 'Python libraries to link with', python_lib_default),
267      ('python_cmd', 'Python command', 'python'),
268  # Boost  # Boost
269    PathOption('boost_path', 'Path to Boost includes', boost_path_default),    PathOption('boost_path', 'Path to Boost includes', boost_path_default),
270    PathOption('boost_libs_path', 'Path to Boost libs', boost_libs_path_default),    PathOption('boost_lib_path', 'Path to Boost libs', boost_lib_path_default),
271    ('boost_libs', 'Boost libraries to link with', boost_libs_default),    ('boost_lib', 'Boost libraries to link with', boost_lib_default),
272  # Doc building  # Doc building
273  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),
274  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),
# Line 230  opts.AddOptions( Line 276  opts.AddOptions(
276    PathOption('papi_path', 'Path to PAPI includes', None),    PathOption('papi_path', 'Path to PAPI includes', None),
277    PathOption('papi_lib_path', 'Path to PAPI libs', None),    PathOption('papi_lib_path', 'Path to PAPI libs', None),
278    ('papi_libs', 'PAPI libraries to link with', None),    ('papi_libs', 'PAPI libraries to link with', None),
279      ('papi_instrument_solver', 'use PAPI in Solver.c to instrument each iteration of the solver', None),
280  # MPI  # MPI
281    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),    BoolOption('useMPI', 'Compile parallel version using MPI', useMPI_default),
282      ('MPICH_IGNORE_CXX_SEEK', 'name of macro to ignore MPI settings of C++ SEEK macro (for MPICH)' , 'MPICH_IGNORE_CXX_SEEK'),
283      PathOption('mpi_path', 'Path to MPI includes', mpi_path_default),
284      ('mpi_run', 'mpirun name' , mpi_run_default),
285      PathOption('mpi_lib_path', 'Path to MPI libs (needs to be added to the LD_LIBRARY_PATH)',mpi_lib_path_default),
286      ('mpi_libs', 'MPI libraries to link with (needs to be shared!)', mpi_libs_default)
287  )  )
288  #=================================================================================================  #=================================================================================================
289  #  #
# Line 243  opts.AddOptions( Line 295  opts.AddOptions(
295  #   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)
296  #   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
297  #  #
 IS_WINDOWS_PLATFORM = (os.name== "nt")  
298    
299  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
300        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
301          #env = Environment(tools = ['default', 'intelc'], options = opts)
302  else:  else:
303     if os.uname()[4]=='ia64':     if socket.gethostname().split('.')[0] == 'service0':
304          env = Environment(tools = ['default', 'intelc'], options = opts)
305       elif os.uname()[4]=='ia64':
306        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
307        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
308           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
# Line 256  else: Line 310  else:
310        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
311  Help(opts.GenerateHelpText(env))  Help(opts.GenerateHelpText(env))
312    
313    if env['bounds_check']:
314       env.Append(CPPDEFINES = [ 'BOUNDS_CHECK' ])
315       env.Append(CXXDEFINES = [ 'BOUNDS_CHECK' ])
316       bounds_check = env['bounds_check']
317    else:
318       bounds_check = 0
319    
320  #=================================================================================================  #=================================================================================================
321  #  #
322  #     Initialise Scons Build Environment  #     Initialise Scons Build Environment
323  #     check for user environment variables we are interested in  #     check for user environment variables we are interested in
324  try:  try:
325     python_path = os.environ['PYTHONPATH']     tmp = os.environ['PYTHONPATH']
326     env['ENV']['PYTHONPATH'] = python_path     env['ENV']['PYTHONPATH'] = tmp
327  except KeyError:  except KeyError:
328     python_path = ''     pass
329    
330    env.PrependENVPath('PYTHONPATH', source_root)
331    
332  try:  try:
333     omp_num_threads = os.environ['OMP_NUM_THREADS']     omp_num_threads = os.environ['OMP_NUM_THREADS']
# Line 273  except KeyError: Line 336  except KeyError:
336  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
337    
338  try:  try:
339       path = os.environ['PATH']
340       env['ENV']['PATH'] = path
341    except KeyError:
342       omp_num_threads = 1
343    
344    env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
345    
346    
347    # Copy some variables from the system environment to the build environment
348    try:
349     env['ENV']['DISPLAY'] = os.environ['DISPLAY']     env['ENV']['DISPLAY'] = os.environ['DISPLAY']
350     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']
351       home_temp = os.environ['HOME']   # MPICH2's mpd needs $HOME to find $HOME/.mpd.conf
352       env['ENV']['HOME'] = home_temp
353  except KeyError:  except KeyError:
354     pass     pass
355    
356  try:  try:
357     path = os.environ['PATH']     tmp = os.environ['PATH']
358     env['ENV']['PATH'] = path     env['ENV']['PATH'] = tmp
359  except KeyError:  except KeyError:
360     path = ''     pass
361    
362  try:  try:
363     ld_library_path = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
364     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path     env['ENV']['LD_LIBRARY_PATH'] = tmp
365  except KeyError:  except KeyError:
366     ld_library_path = ''     pass
367  #==========================================================================  #==========================================================================
368  #  #
369  #    Add some customer builders  #    Add some customer builders
# Line 295  except KeyError: Line 371  except KeyError:
371  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)
372  env.Append(BUILDERS = {'PyCompile' : py_builder});  env.Append(BUILDERS = {'PyCompile' : py_builder});
373    
374  # TODO: use the inbuilt scons suffix variable.  runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed',
375  if IS_WINDOWS_PLATFORM:                                src_suffix=env['PROGSUFFIX'], single_source=True)
376     runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', src_suffix='.exe', single_source=True)  
 else:  
    runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', single_source=True)  
377  env.Append(BUILDERS = {'RunUnitTest' : runUnitTest_builder});  env.Append(BUILDERS = {'RunUnitTest' : runUnitTest_builder});
378    
379  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 315  try: Line 389  try:
389     libinstall = env['libinstall']     libinstall = env['libinstall']
390     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so     env.Append(LIBPATH = [libinstall,]) # Adds -L for building of libescript.so libfinley.so escriptcpp.so finleycpp.so
391     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
392     if env['PLATFORM'] == "win32":     if IS_WINDOWS_PLATFORM :
393        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
394        env.PrependENVPath('PATH', env['boost_libs_path'])        env.PrependENVPath('PATH', env['boost_lib_path'])
395  except KeyError:  except KeyError:
396     libinstall = None     libinstall = None
397  try:  try:
398     pyinstall = env['pyinstall'] # 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'])  
399  except KeyError:  except KeyError:
400     pyinstall = None     pyinstall = None
401    
402    try:
403       cc_defines = env['cc_defines']
404       env.Append(CPPDEFINES = cc_defines)
405    except KeyError:
406       pass
407    try:
408       flags = env['ar_flags']
409       env.Append(ARFLAGS = flags)
410    except KeyError:
411       ar_flags = None
412    try:
413       sys_libs = env['sys_libs']
414    except KeyError:
415       sys_libs = []
416    
417    try:
418       tar_flags = env['tar_flags']
419       env.Replace(TARFLAGS = tar_flags)
420    except KeyError:
421       pass
422    
423  try:  try:
424     exinstall = env['exinstall']     exinstall = env['exinstall']
425  except KeyError:  except KeyError:
426     exinstall = None     exinstall = None
427  try:  try:
428       sys_libinstall = env['sys_libinstall']
429    except KeyError:
430       sys_libinstall = None
431    try:
432       sys_pyinstall = env['sys_pyinstall']
433    except KeyError:
434       sys_pyinstall = None
435    try:
436       sys_exinstall = env['sys_exinstall']
437    except KeyError:
438       sys_exinstall = None
439    
440    # ====================== debugging ===================================
441    try:
442     dodebug = env['dodebug']     dodebug = env['dodebug']
443  except KeyError:  except KeyError:
444     dodebug = None     dodebug = None
445    
446    # === switch on omp ===================================================
447  try:  try:
448     useMPI = env['useMPI']    omp_flags = env['omp_flags']
449  except KeyError:  except KeyError:
450     useMPI = None    omp_flags = ''
451    
452  try:  try:
453     cc_defines = env['cc_defines']    omp_flags_debug = env['omp_flags_debug']
    env.Append(CPPDEFINES = cc_defines)  
454  except KeyError:  except KeyError:
455     pass    omp_flags_debug = ''
456    
457    # ========= use mpi? =====================================================
458    try:
459       useMPI = env['useMPI']
460    except KeyError:
461       useMPI = None
462    # ========= set compiler flags ===========================================
463    
464  if dodebug:  if dodebug:
   if useMPI:  
     try:  
       flags = env['cc_flags_debug_MPI']  
       env.Append(CCFLAGS = flags)  
     except KeyError:  
       pass  
   else:  
465      try:      try:
466        flags = env['cc_flags_debug']        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
467        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
468      except KeyError:      except KeyError:
469        pass        pass
470  else:  else:
   if useMPI:  
471     try:     try:
472       flags = env['cc_flags_MPI']        flags = env['cc_flags'] + ' ' + omp_flags
      env.Append(CCFLAGS = flags)  
    except KeyError:  
       pass  
   else:  
    try:  
       flags = env['cc_flags']  
473        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
474     except KeyError:     except KeyError:
475        pass        pass
476  if dodebug:  if dodebug:
    if useMPI:  
477       try:       try:
478          flags = env['cxx_flags_debug_MPI']          flags = env['cxx_flags_debug']
479          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
480       except KeyError:       except KeyError:
481          pass          pass
482     else:  else:
483       try:       try:
484          flags = env['cxx_flags_debug']          flags = env['cxx_flags']
485          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
486       except KeyError:       except KeyError:
487          pass          pass
488  else:  
489     if useMPI:  # Impassioned plea - please do this sort of thing in the options files.
490    try:
491         if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
492    except:
493         pass
494    
495    if dodebug:
496       try:       try:
497          flags = env['cxx_flags_MPI']          flags = env['link_flags_debug']
498          env.Append(CXXFLAGS = flags)          env.Append(LINKFLAGS = flags)
499       except KeyError:       except KeyError:
500          pass          pass
501     else:  else:
502       try:       try:
503          flags = env['cxx_flags']          flags = env['link_flags']
504          env.Append(CXXFLAGS = flags)          env.Append(LINKFLAGS = flags)
505       except KeyError:       except KeyError:
506          pass          pass
 try:  
    flags = env['ar_flags']  
    env.Append(ARFLAGS = flags)  
 except KeyError:  
    ar_flags = None  
 try:  
    sys_libs = env['sys_libs']  
 except KeyError:  
    sys_libs = []  
507    
508  try:  # ============= Remember what options were used in the compile =====================================
509     tar_flags = env['tar_flags']  if not IS_WINDOWS_PLATFORM:
510     env.Replace(TARFLAGS = tar_flags)    env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
511  except KeyError:    if dodebug:       env.Execute("touch " + libinstall + "/Compiled.with.debug")
512     pass    if useMPI:        env.Execute("touch " + libinstall + "/Compiled.with.mpi")
513      if omp_flags != '':   env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
514      if bounds_check:  env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
515    
516  try:  # ============= set mkl (but only of no MPI) =====================================
517     includes = env['mkl_path']  if not useMPI:
518     env.Append(CPPPATH = [includes,])     try:
519  except KeyError:        includes = env['mkl_path']
520     pass        env.Append(CPPPATH = [includes,])
521       except KeyError:
522          pass
523    
524  try:     try:
525     lib_path = env['mkl_lib_path']        lib_path = env['mkl_lib_path']
526     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
527  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
528     pass     except KeyError:
529          pass
530    
 if useMPI:  
    mkl_libs = []  
 else:  
531     try:     try:
532        mkl_libs = env['mkl_libs']        mkl_libs = env['mkl_libs']
533     except KeyError:     except KeyError:
534        mkl_libs = []        mkl_libs = []
535    else:
536         mkl_libs = []
537    
538  try:  # ============= set scsl (but only of no MPI) =====================================
539     includes = env['scsl_path']  if not useMPI:
540     env.Append(CPPPATH = [includes,])     try:
541  except KeyError:        includes = env['scsl_path']
542     pass        env.Append(CPPPATH = [includes,])
543       except KeyError:
544          pass
545    
546  try:     try:
547     lib_path = env['scsl_lib_path']        lib_path = env['scsl_lib_path']
548     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
549  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
550     pass     except KeyError:
551          pass
552      
553       try:
554          scsl_libs = env['scsl_libs']
555       except KeyError:
556          scsl_libs = [ ]
557    
558  if useMPI:  else:
559    try:      scsl_libs =  []
     scsl_libs = env['scsl_libs_MPI']  
   except KeyError:  
     scsl_libs = []  
 else:  
   try:  
     scsl_libs = env['scsl_libs']  
   except KeyError:  
     scsl_libs = []  
560    
561  try:  # ============= set TRILINOS (but only with MPI) =====================================
562     includes = env['umf_path']  if useMPI:
563     env.Append(CPPPATH = [includes,])     try:
564  except KeyError:        includes = env['trilinos_path']
565     pass        env.Append(CPPPATH = [includes,])
566       except KeyError:
567          pass
568    
569  try:     try:
570     lib_path = env['umf_lib_path']        lib_path = env['trilinos_lib_path']
571     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
572  except KeyError:     except KeyError:
573     pass        pass
574    
575  if useMPI:     try:
576      umf_libs = []        trilinos_libs = env['trilinos_libs']
577       except KeyError:
578          trilinos_libs = []
579  else:  else:
580         trilinos_libs = []
581    
582    
583    # ============= set umfpack (but only without MPI) =====================================
584    umf_libs=[ ]
585    if not useMPI:
586       try:
587          includes = env['umf_path']
588          env.Append(CPPPATH = [includes,])
589       except KeyError:
590          pass
591    
592       try:
593          lib_path = env['umf_lib_path']
594          env.Append(LIBPATH = [lib_path,])
595       except KeyError:
596          pass
597    
598     try:     try:
599        umf_libs = env['umf_libs']        umf_libs = env['umf_libs']
600          umf_libs+=umf_libs
601     except KeyError:     except KeyError:
602        umf_libs = []        pass
603    
604  try:     try:
605     includes = env['ufc_path']        includes = env['ufc_path']
606     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
607  except KeyError:     except KeyError:
608     pass        pass
609    
610  try:     try:
611     includes = env['amd_path']        includes = env['amd_path']
612     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
613  except KeyError:     except KeyError:
614     pass        pass
615    
616  try:     try:
617     lib_path = env['amd_lib_path']        lib_path = env['amd_lib_path']
618     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
619  except KeyError:     except KeyError:
620     pass        pass
621    
 if useMPI:  
     amd_libs = []  
 else:  
622     try:     try:
623        amd_libs = env['amd_libs']        amd_libs = env['amd_libs']
624          umf_libs+=amd_libs
625     except KeyError:     except KeyError:
626        amd_libs = []        pass
627    
628    # ============= set TRILINOS (but only with MPI) =====================================
629    if useMPI:
630       try:
631          includes = env['trilinos_path']
632          env.Append(CPPPATH = [includes,])
633       except KeyError:
634          pass
635    
636       try:
637          lib_path = env['trilinos_lib_path']
638          env.Append(LIBPATH = [lib_path,])
639       except KeyError:
640          pass
641    
642       try:
643          trilinos_libs = env['trilinos_libs']
644       except KeyError:
645          trilinos_libs = []
646    else:
647         trilinos_libs = []
648    
649    # ============= set blas =====================================
650  try:  try:
651     includes = env['blas_path']     includes = env['blas_path']
652     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 515  except KeyError: Line 662  except KeyError:
662  try:  try:
663     blas_libs = env['blas_libs']     blas_libs = env['blas_libs']
664  except KeyError:  except KeyError:
665     blas_libs = []     blas_libs = [ ]
666    
667    # ========== netcdf ====================================
668  try:  try:
669     useNetCDF = env['useNetCDF']     useNetCDF = env['useNetCDF']
670  except KeyError:  except KeyError:
671     useNetCDF = 'yes'     useNetCDF = 'yes'
672     pass     pass
673        
 if not useNetCDF == 'yes':  
    print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."  
     
674  if useNetCDF == 'yes':  if useNetCDF == 'yes':
675     try:     try:
676          netCDF_libs = env['netCDF_libs']
677       except KeyError:
678          pass
679    
680       env.Append(LIBS = netCDF_libs)
681       env.Append(CPPDEFINES = [ 'USE_NETCDF' ])
682       try:
683        includes = env['netCDF_path']        includes = env['netCDF_path']
684        env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
685     except KeyError:     except KeyError:
# Line 535  if useNetCDF == 'yes': Line 687  if useNetCDF == 'yes':
687    
688     try:     try:
689        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
       if IS_WINDOWS_PLATFORM: env['ENV']['PATH']+=";"+lib_path  
690        env.Append(LIBPATH = [ lib_path, ])        env.Append(LIBPATH = [ lib_path, ])
691          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
692          if IS_WINDOWS_PLATFORM :
693             env.PrependENVPath('PATH', lib_path)
694     except KeyError:     except KeyError:
695        pass        pass
   
    try:  
       netCDF_libs = env['netCDF_libs']  
    except KeyError:  
       netCDF_libs = [ ]  
696  else:  else:
697       print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."
698     netCDF_libs=[ ]     netCDF_libs=[ ]
699    
700    # ====================== boost ======================================
701  try:  try:
702     includes = env['boost_path']     includes = env['boost_path']
703     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
704  except KeyError:  except KeyError:
705     pass     pass
706  try:  try:
707     lib_path = env['boost_libs_path']     lib_path = env['boost_lib_path']
708     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
709       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
710       if IS_WINDOWS_PLATFORM :
711          env.PrependENVPath('PATH', lib_path)
712  except KeyError:  except KeyError:
713     pass     pass
714  try:  try:
715     boost_libs = env['boost_libs']     boost_lib = env['boost_lib']
716  except KeyError:  except KeyError:
717     boost_libs = None     boost_lib = None
718    # ====================== python ======================================
719  try:  try:
720     includes = env['python_path']     includes = env['python_path']
721     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 568  except KeyError: Line 723  except KeyError:
723     pass     pass
724  try:  try:
725     lib_path = env['python_lib_path']     lib_path = env['python_lib_path']
726       env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
727     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
728  except KeyError:  except KeyError:
729     pass     pass
730  try:  try:
731     python_libs = env['python_libs']     python_lib = env['python_lib']
732  except KeyError:  except KeyError:
733     python_libs = None     python_lib = None
734    # =============== documentation =======================================
735  try:  try:
736     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
737  except KeyError:  except KeyError:
# Line 583  try: Line 740  try:
740     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
741  except KeyError:  except KeyError:
742     epydoc_path = None     epydoc_path = None
743    # =============== ParMETIS =======================================
744    try:
745       parmetis_path = env['parmetis_path']
746       parmetis_lib_path = env['parmetis_lib_path']
747       parmetis_lib = env['parmetis_lib']
748    except KeyError:
749       parmetis_path = ''
750       parmetis_lib_path = ''
751       parmetis_lib = ''
752    
753    if useMPI and os.path.isdir(parmetis_lib_path):
754       env.Append(CPPDEFINES = [ 'PARMETIS' ])
755       env.Append(CXXDEFINES = [ 'PARMETIS' ])
756       env.Append(CPPPATH = [parmetis_path])
757       env.Append(LIBPATH = [parmetis_lib_path])
758       env.Append(LIBS = parmetis_lib)
759    # =============== PAPI =======================================
760    try:
761       includes = env['papi_path']
762       env.Append(CPPPATH = [includes,])
763    except KeyError:
764       pass
765    try:
766       lib_path = env['papi_lib_path']
767       env.Append(LIBPATH = [lib_path,])
768    except KeyError:
769       pass
770    try:
771       papi_libs = env['papi_libs']
772    except KeyError:
773       papi_libs = None
774    # ============= set mpi =====================================
775    if useMPI:
776       env.Append(CPPDEFINES=['PASO_MPI', 'MPI_NO_CPPBIND'])
777       try:
778          includes = env['mpi_path']
779          env.Append(CPPPATH = [includes,])
780       except KeyError:
781          pass
782       try:
783          lib_path = env['mpi_lib_path']
784          env.Append(LIBPATH = [lib_path,])
785          env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
786       except KeyError:
787          pass
788       try:
789          mpi_libs = env['mpi_libs']
790       except KeyError:
791          mpi_libs = []
792    
793       try:
794          mpi_run = env['mpi_run']
795       except KeyError:
796          mpi_run = ''
797    
798       try:
799           mpich_ignore_cxx_seek=env['MPICH_IGNORE_CXX_SEEK']
800           env.Append(CPPDEFINES = [ mpich_ignore_cxx_seek ] )
801       except KeyError:
802          pass
803    else:
804      mpi_libs=[]
805      mpi_run = mpi_run_default
806    # =========== zip files ===========================================
807  try:  try:
808     includes = env['papi_path']     includes = env['papi_path']
809     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 597  try: Line 818  try:
818     papi_libs = env['papi_libs']     papi_libs = env['papi_libs']
819  except KeyError:  except KeyError:
820     papi_libs = None     papi_libs = None
821    try:
822       papi_instrument_solver = env['papi_instrument_solver']
823    except KeyError:
824       papi_instrument_solver = None
825    
826    
827    # ============= and some helpers =====================================
828    try:
829       doxygen_path = env['doxygen_path']
830    except KeyError:
831       doxygen_path = None
832    try:
833       epydoc_path = env['epydoc_path']
834    except KeyError:
835       epydoc_path = None
836  try:  try:
837     src_zipfile = env.File(env['src_zipfile'])     src_zipfile = env.File(env['src_zipfile'])
838  except KeyError:  except KeyError:
# Line 645  try: Line 879  try:
879  except KeyError:  except KeyError:
880     api_doxygen = None     api_doxygen = None
881    
882    try:
883       svn_pipe = os.popen("svnversion -n .")
884       global_revision = svn_pipe.readlines()
885       svn_pipe.close()
886       global_revision = re.sub(":.*", "", global_revision[0])
887       global_revision = re.sub("[^0-9]", "", global_revision)
888    except:
889       global_revision="-1"
890       print "Warning: unable to recover global revsion number."
891    if global_revision == "": global_revision="0"
892    print "Revision number is %s."%global_revision
893    env.Append(CPPDEFINES = "SVN_VERSION="+global_revision)
894    
895    # Python install - esys __init__.py
896    init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
897    
898    # FIXME: exinstall and friends related to examples are not working.
899    build_target = env.Alias('build',[libinstall,incinstall,pyinstall,init_target])
900    
901    env.Default(build_target)
902    
903  # Zipgets  # Zipgets
 env.Default(libinstall)  
 env.Default(incinstall)  
 env.Default(pyinstall)  
 ### env.Default(exinstall) # ksteube this causes dependency error  
904  env.Alias('release_src',[ src_zipfile, src_tarfile ])  env.Alias('release_src',[ src_zipfile, src_tarfile ])
905  env.Alias('release_tests',[ test_zipfile, test_tarfile])  env.Alias('release_tests',[ test_zipfile, test_tarfile])
906  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])
# Line 661  env.Alias('guide_html_index',guide_html_ Line 912  env.Alias('guide_html_index',guide_html_
912  env.Alias('guide_pdf', guide_pdf)  env.Alias('guide_pdf', guide_pdf)
913  env.Alias('docs',[ 'release_examples', 'guide_pdf', api_epydoc, api_doxygen, guide_html_index])  env.Alias('docs',[ 'release_examples', 'guide_pdf', api_epydoc, api_doxygen, guide_html_index])
914  env.Alias('release', ['release_src', 'release_tests', 'docs'])  env.Alias('release', ['release_src', 'release_tests', 'docs'])
915  env.Alias('build_tests')    # target to build all C++ tests  
916  env.Alias('build_py_tests') # target to build all python tests  env.Alias('build_tests',build_target)    # target to build all C++ tests
917    env.Alias('build_py_tests',build_target) # target to build all python tests
918  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
919  env.Alias('run_tests', 'build_tests')   # target to run all C++ test  env.Alias('run_tests', 'build_tests')   # target to run all C++ test
920  env.Alias('py_tests', 'build_py_tests') # taget to run all released python tests  env.Alias('py_tests', 'build_py_tests') # taget to run all released python tests
921  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
922    
 # Python install - esys __init__.py  
 init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))  
 env.Alias(init_target)  
923    
924  # Allow sconscripts to see the env  # Allow sconscripts to see the env
925  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "exinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs", "useNetCDF",  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "blas_libs", "netCDF_libs", "useNetCDF", "mpi_run",
926      "boost_libs", "python_libs", "doxygen_path", "epydoc_path", "papi_libs",      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",
927          "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", "trilinos_libs", "mpi_libs", "papi_instrument_solver",
928          "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI" ])          "guide_pdf", "guide_html_index", "api_epydoc", "api_doxygen", "useMPI" ])
929    
930  # End initialisation section  # End initialisation section
931  # Begin configuration section  # Begin configuration section
932  # adds this file and the scons option directore to the source tar  # adds this file and the scons option directore to the source tar
933  release_srcfiles=[env.File('SConstruct'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]  release_srcfiles=[env.File('SConstruct'),env.Dir('lib'),env.Dir('include'),]+[ env.File(x) for x in glob.glob('scons/*.py') ]
934  release_testfiles=[env.File('README_TESTS'),]  release_testfiles=[env.File('README_TESTS'),]
935  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
936  env.Zip(test_zipfile, release_testfiles)  env.Zip(test_zipfile, release_testfiles)
# Line 696  except AttributeError: Line 945  except AttributeError:
945  # Third Party libraries  # Third Party libraries
946  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)
947  # C/C++ Libraries  # C/C++ Libraries
948    env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)
949    env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)
950  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)
951  # bruce is removed for now as it doesn't really do anything  # bruce is removed for now as it doesn't really do anything
952  # env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)  # env.SConscript(dirs = ['bruce/src'], build_dir='build/$PLATFORM/bruce', duplicate=0)
 env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  
 env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  
953  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)
954  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)
955  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)
956  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)
957  env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)  env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)
   
 # added by Ben Cumming  
958  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)
959  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)
960    
961    
962    syslib_install_target = env.installDirectory(sys_libinstall,libinstall)
963    syspy_install_target = env.installDirectory(sys_pyinstall,pyinstall,recursive=True)
964    
965    install_target = env.Alias("install", env.Flatten([syslib_install_target, syspy_install_target]) )

Legend:
Removed from v.1232  
changed lines
  Added in v.1634

  ViewVC Help
Powered by ViewVC 1.1.26