/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1185 by gross, Thu May 31 04:33:31 2007 UTC revision 1416 by ksteube, Mon Feb 25 03:56:17 2008 UTC
# Line 12  Line 12 
12  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
13  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
14    
15    
16  #===============================================================  #===============================================================
17  #   import tools:  #   import tools:
18  import glob  import glob
19  import sys, os  import sys, os, re
 import socket  
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  #===============================================================  #===============================================================
 #   check on windows or linux platform  
 #  
 IS_WINDOWS_PLATFORM = (os.name== "nt")  
28    
29  if IS_WINDOWS_PLATFORM:  tools_prefix="/usr"
    tools_prefix="C:\\Program Files\\"  
 else:  
    tools_prefix="/usr"  
30    
31  #==============================================================================================      #==============================================================================================    
32  #      #    
33  #    get the iinstallation prefix  #    get the installation prefix
34  #  #
35  prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)  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  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.
# Line 47  print "Install prefix is: ", prefix Line 72  print "Install prefix is: ", prefix
72  #      #    
73  #    get the options file if present:  #    get the options file if present:
74  #  #
75  if ARGUMENTS.get('options_file',0):  options_file = ARGUMENTS.get('options_file','')
76     options_file = ARGUMENTS.get('options_file',0)  
77  else:  if not os.path.isfile(options_file) :
78     from string import ascii_letters,digits      options_file = False
79     hostname=""  
80     for s in socket.gethostname().split('.')[0]:  if not options_file :
81        if s in ascii_letters+digits:     import socket
82           hostname+=s     hostname = re.sub("[^0-9a-zA-Z]", "_", socket.gethostname().split('.')[0])
83        else:     tmp = os.path.join("scons",hostname+"_options.py")
84           hostname+="_"  
85     options_file = os.path.join("scons",hostname+"_options.py")     if os.path.isfile(tmp) :
86            options_file = tmp
87  if os.path.isfile(options_file):  
88     print "option file is ",options_file,"."  IS_WINDOWS_PLATFORM = (os.name== "nt")
89  else:  
90     print "option file is ",options_file, "(not present)."  # 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  # and load it
99  opts = Options(options_file, ARGUMENTS)  opts = Options(options_file, ARGUMENTS)
100  #================================================================  #================================================================
# Line 96  else: Line 128  else:
128  #  #
129  #    python installation:  #    python installation:
130  #  #
131  if IS_WINDOWS_PLATFORM:  python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))
132     python_path_default=os.path.join(tools_prefix,'python%s%s'%(sys.version_info[0],sys.version_info[1]),"include")  python_lib_path_default=os.path.join(tools_prefix,'lib')
133     python_lib_path_default=os.path.join(tools_prefix,'python%s%s'%(sys.version_info[0],sys.version_info[1]),"libs")  python_lib_default="python%s.%s"%(sys.version_info[0],sys.version_info[1])
    python_libs_default=["python%s%s"%(sys.version_info[0],sys.version_info[1])]  
 else:  
    python_path_default=os.path.join(tools_prefix,'include','python%s.%s'%(sys.version_info[0],sys.version_info[1]))  
    python_lib_path_default=os.path.join(tools_prefix,'lib')  
    python_libs_default=["python%s.%s"%(sys.version_info[0],sys.version_info[1])]  
134    
135  #==========================================================================  #==========================================================================
136  #  #
137  #    boost installation:  #    boost installation:
138  #  #
139  if IS_WINDOWS_PLATFORM:  boost_path_default=os.path.join(tools_prefix,'include')
140     boost_libs_path_default=os.path.join(tools_prefix,'boost','lib')  boost_lib_path_default=os.path.join(tools_prefix,'lib')
141     boost_libs_default=None  boost_lib_default=['boost_python']
142     for i in os.listdir(boost_libs_path_default):  
       name=os.path.splitext(i)  
       if name[1] == ".dll" and name[0].startswith("boost_python"):  
           if boost_libs_default == None:  
          boost_libs_default= [ name[0] ]  
       else:  
          if not name[0].find("-gd-"): boost_libs_default=[ name[0] ]  
    boost_path_default=os.path.join(tools_prefix,'boost','include','boost-%s'%(boost_libs_default[0].split("-")[-1],))  
 else:  
    boost_path_default=os.path.join(tools_prefix,'include')  
    boost_libs_path_default=os.path.join(tools_prefix,'lib')  
    boost_libs_default=['boost_python']  
143  #==========================================================================  #==========================================================================
144  #  #
145  #    check if netCDF is installed on the system:  #    check if netCDF is installed on the system:
146  #  #
147  if IS_WINDOWS_PLATFORM:  netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')
148      netcdf_dir=os.path.join(tools_prefix,'netcdf')  netCDF_lib_path_default=os.path.join(tools_prefix,'lib')
     netCDF_path_default=os.path.join(netcdf_dir,'include')  
     netCDF_lib_path_default=os.path.join(netcdf_dir,'lib')  
 else:  
     netCDF_path_default=os.path.join(tools_prefix,'include','netcdf-3')  
     netCDF_lib_path_default=os.path.join(tools_prefix,'lib','netcdf-3')  
149    
150  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):
151       useNetCDF_default='yes'       useNetCDF_default='yes'
# Line 145  else: Line 156  else:
156       netCDF_lib_path_default=None       netCDF_lib_path_default=None
157       netCDF_libs_default=None       netCDF_libs_default=None
158    
159    #==========================================================================
160    #
161    #  MPI:
162    #
163  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
164          useNetCDF_default='no' # be default netcdf is not supported on windows.     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:  #    compile:
180  #  #
181  if IS_WINDOWS_PLATFORM:  cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi'
182      # cc_flags_default  = '/GR /EHsc /MD /Qc99 /Qopenmp /Qopenmp-report1 /O3 /G7 /Qprec /Qpar-report1 /QxP /QaxP'  cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi'
183      # cc_flags_debug_default  = '/Od /MDd /RTC1 /GR /EHsc /Qc99 /Qopenmp /Qopenmp-report1 /Qprec'  cxx_flags_default='--no-warn -ansi'
184      cc_flags_default  = '/nologo /EHsc /GR  /wd4068 /O2 /Op /MT /W3 /Ob0 /Z7'  cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
185      cc_flags_debug_default  ='/nologo /EHsc /GR  /wd4068 /Od /RTC1 /MTd /ZI /Ob0 /Z7'  
       
     cc_flags_default  = '/nologo /EHsc /GR  /O2 /MT /W3 /Ob0 /Z7 /wd4068'  
     cc_flags_debug_default  ='/nologo /EHsc /GR /Od /RTC1 /MTd /W3 /Ob0 /Z7/wd4068'  
     cxx_flags_default = ''  
     cxx_flags_debug_default = ''  
     cc_common_flags = '/FD /EHsc /GR /wd4068 '  
 else:  
    cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'  
    cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'  
    cxx_flags_default='--no-warn -ansi'  
    cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'  
186  #==============================================================================================      #==============================================================================================    
187  # Default options and options help text  # Default options and options help text
188  # 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 174  else: Line 190  else:
190  # DO NOT CHANGE THEM HERE  # 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', prefix+'/include'),    ('incinstall', 'where the esys headers will be installed',             Dir('#.').abspath+'/include'),
194    ('libinstall', 'where the esys libraries will be installed', prefix+'/lib'),    ('libinstall', 'where the esys libraries will be installed',           dir_libraries),
195    ('pyinstall', 'where the esys python modules will be installed', prefix),    ('pyinstall', 'where the esys python modules will be installed',       dir_packages),
196    ('src_zipfile', 'the source zip file will be installed.', prefix+"/release/escript_src.zip"),    ('exinstall', 'where the esys examples will be installed',             dir_examples),
197    ('test_zipfile', 'the test zip file will be installed.', prefix+"/release/escript_tests.zip"),    ('sys_libinstall', 'where the system esys libraries will be installed',       sys_dir_libraries),
198    ('src_tarfile', 'the source tar file will be installed.', prefix+"/release/escript_src.tar.gz"),    ('sys_pyinstall', 'where the system esys python modules will be installed',   sys_dir_packages),
199    ('test_tarfile', 'the test tar file will be installed.', prefix+"/release/escript_tests.tar.gz"),    ('sys_exinstall', 'where the system esys examples will be installed',         sys_dir_examples),
200    ('examples_tarfile', 'the examples tar file will be installed.', prefix+"/release/doc/escript_examples.tar.gz"),    ('src_zipfile', 'the source zip file will be installed.',              Dir('#.').abspath+"/release/escript_src.zip"),
201    ('examples_zipfile', 'the examples zip file will be installed.', prefix+"/release/doc/escript_examples.zip"),    ('test_zipfile', 'the test zip file will be installed.',               Dir('#.').abspath+"/release/escript_tests.zip"),
202    ('guide_pdf', 'name of the user guide in pdf format', prefix+"/release/doc/user/guide.pdf"),    ('src_tarfile', 'the source tar file will be installed.',              Dir('#.').abspath+"/release/escript_src.tar.gz"),
203    ('api_epydoc', 'name of the epydoc api docs directory',prefix+"/release/doc/epydoc"),    ('test_tarfile', 'the test tar file will be installed.',               Dir('#.').abspath+"/release/escript_tests.tar.gz"),
204    ('guide_html', 'name of the directory for user guide in html format', prefix+"/release/doc/user/html"),    ('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?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
212      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),    ('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)', cc_flags_default),    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),
216    ('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),
217    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
218    ('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),
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'),    ('tar_flags','flags for zip files','-c -z'),
# Line 215  opts.AddOptions( Line 239  opts.AddOptions(
239    PathOption('amd_path', 'Path to AMD includes', amd_path_default),    PathOption('amd_path', 'Path to AMD includes', amd_path_default),
240    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),    PathOption('amd_lib_path', 'Path to AMD libs', amd_lib_path_default),
241    ('amd_libs', 'AMD libraries to link with', amd_libs_default),    ('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  # BLAS
247    PathOption('blas_path', 'Path to BLAS includes', None),    PathOption('blas_path', 'Path to BLAS includes', None),
248    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
# Line 226  opts.AddOptions( Line 254  opts.AddOptions(
254    ('netCDF_libs', 'netCDF C++ libraries to link with', netCDF_libs_default),    ('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    # FIXME: python_path should be python_inc_path and the same for boost etc.
258    PathOption('python_path', 'Path to Python includes', python_path_default),    PathOption('python_path', 'Path to Python includes', python_path_default),
259    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),
260    ('python_libs', 'Python libraries to link with', python_libs_default),    ('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', boost_path_default),    PathOption('boost_path', 'Path to Boost includes', boost_path_default),
264    PathOption('boost_libs_path', 'Path to Boost libs', boost_libs_path_default),    PathOption('boost_lib_path', 'Path to Boost libs', boost_lib_path_default),
265    ('boost_libs', 'Boost libraries to link with', boost_libs_default),    ('boost_lib', 'Boost libraries to link with', boost_lib_default),
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),
# Line 240  opts.AddOptions( Line 270  opts.AddOptions(
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  # MPI
275    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),    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  #  #
# Line 253  opts.AddOptions( Line 289  opts.AddOptions(
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)  #   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  #   FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix
291  #  #
292    
293  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
294        env = Environment(tools = ['default', 'msvc'], options = opts)        env = Environment(tools = ['default', 'msvc'], options = opts)
295  else:  else:
# Line 263  else: Line 300  else:
300     else:     else:
301        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
302  Help(opts.GenerateHelpText(env))  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  #     Initialise Scons Build Environment
314  #     check for user environment variables we are interested in  #     check for user environment variables we are interested in
315  try:  try:
316     python_path = os.environ['PYTHONPATH']     tmp = os.environ['PYTHONPATH']
317     env['ENV']['PYTHONPATH'] = python_path     env['ENV']['PYTHONPATH'] = tmp
318  except KeyError:  except KeyError:
319     python_path = ''     pass
320    
321    env.PrependENVPath('PYTHONPATH', source_root)
322    
323  try:  try:
324     omp_num_threads = os.environ['OMP_NUM_THREADS']     omp_num_threads = os.environ['OMP_NUM_THREADS']
# Line 280  except KeyError: Line 327  except KeyError:
327  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads  env['ENV']['OMP_NUM_THREADS'] = omp_num_threads
328    
329  try:  try:
330       path = os.environ['PATH']
331       env['ENV']['PATH'] = path
332    except KeyError:
333       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:
340     env['ENV']['DISPLAY'] = os.environ['DISPLAY']     env['ENV']['DISPLAY'] = os.environ['DISPLAY']
341     env['ENV']['XAUTHORITY'] = os.environ['XAUTHORITY']     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     pass     pass
346    
347  try:  try:
348     path = os.environ['PATH']     tmp = os.environ['PATH']
349     env['ENV']['PATH'] = path     env['ENV']['PATH'] = tmp
350  except KeyError:  except KeyError:
351     path = ''     pass
352    
353  try:  try:
354     ld_library_path = os.environ['LD_LIBRARY_PATH']     tmp = os.environ['LD_LIBRARY_PATH']
355     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path     print tmp
356       env['ENV']['LD_LIBRARY_PATH'] = tmp
357  except KeyError:  except KeyError:
358     ld_library_path = ''     pass
359  #==========================================================================  #==========================================================================
360  #  #
361  #    Add some customer builders  #    Add some customer builders
# Line 302  except KeyError: Line 363  except KeyError:
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 IS_WINDOWS_PLATFORM:  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 319  except KeyError: Line 379  except KeyError:
379     incinstall = None     incinstall = None
380  try:  try:
381     libinstall = env['libinstall']     libinstall = env['libinstall']
382     env.Append(LIBPATH = [libinstall,]) # ksteube 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
383     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
384     if env['PLATFORM'] == "win32":     if IS_WINDOWS_PLATFORM :
385        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
386        env.PrependENVPath('PATH', env['boost_libs_path'])        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:
395       cc_defines = env['cc_defines']
396       env.Append(CPPDEFINES = cc_defines)
397    except KeyError:
398       pass
399    try:
400       flags = env['ar_flags']
401       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:
413       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:  try:
434     dodebug = env['dodebug']     dodebug = env['dodebug']
435  except KeyError:  except KeyError:
436     dodebug = None     dodebug = None
437    
438    # === switch on omp ===================================================
439  try:  try:
440     useMPI = env['useMPI']    omp_flags = env['omp_flags']
441  except KeyError:  except KeyError:
442     useMPI = None    omp_flags = ''
443    
444  try:  try:
445     cc_defines = env['cc_defines']    omp_flags_debug = env['omp_flags_debug']
    env.Append(CPPDEFINES = cc_defines)  
446  except KeyError:  except KeyError:
447     pass    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:
   if useMPI:  
     try:  
       flags = env['cc_flags_debug_MPI']  
       env.Append(CCFLAGS = flags)  
     except KeyError:  
       pass  
   else:  
457      try:      try:
458        flags = env['cc_flags_debug']        flags = env['cc_flags_debug'] + ' ' + omp_flags_debug
459        env.Append(CCFLAGS = flags)        env.Append(CCFLAGS = flags)
460      except KeyError:      except KeyError:
461        pass        pass
462  else:  else:
   if useMPI:  
    try:  
      flags = env['cc_flags_MPI']  
      env.Append(CCFLAGS = flags)  
    except KeyError:  
       pass  
   else:  
463     try:     try:
464        flags = env['cc_flags']        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:  if dodebug:
    if useMPI:  
      try:  
         flags = env['cxx_flags_debug_MPI']  
         env.Append(CXXFLAGS = flags)  
      except KeyError:  
         pass  
    else:  
469       try:       try:
470          flags = env['cxx_flags_debug']          flags = env['cxx_flags_debug']
471          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
472       except KeyError:       except KeyError:
473          pass          pass
474  else:  else:
    if useMPI:  
      try:  
         flags = env['cxx_flags_MPI']  
         env.Append(CXXFLAGS = flags)  
      except KeyError:  
         pass  
    else:  
475       try:       try:
476          flags = env['cxx_flags']          flags = env['cxx_flags']
477          env.Append(CXXFLAGS = flags)          env.Append(CXXFLAGS = flags)
478       except KeyError:       except KeyError:
479          pass          pass
480  try:  try:
481     flags = env['ar_flags']       if env['CC'] == 'gcc': env.Append(CCFLAGS = "-pedantic-errors -Wno-long-long")
482     env.Append(ARFLAGS = flags)  except:
483  except KeyError:       pass
484     ar_flags = None  
485  try:  # ============= Remember what options were used in the compile =====================================
486     sys_libs = env['sys_libs']  if not IS_WINDOWS_PLATFORM:
487  except KeyError:    env.Execute("/bin/rm -f " + libinstall + "/Compiled.with.*")
488     sys_libs = []    if dodebug:       env.Execute("touch " + libinstall + "/Compiled.with.debug")
489      if useMPI:        env.Execute("touch " + libinstall + "/Compiled.with.mpi")
490  try:    if omp_flags != '':   env.Execute("touch " + libinstall + "/Compiled.with.OpenMP")
491     tar_flags = env['tar_flags']    if bounds_check:  env.Execute("touch " + libinstall + "/Compiled.with.bounds_check")
    env.Replace(TARFLAGS = tar_flags)  
 except KeyError:  
    pass  
492    
493  try:  # ============= set mkl (but only of no MPI) =====================================
494     includes = env['mkl_path']  if not useMPI:
495     env.Append(CPPPATH = [includes,])     try:
496  except KeyError:        includes = env['mkl_path']
497     pass        env.Append(CPPPATH = [includes,])
498       except KeyError:
499          pass
500    
501  try:     try:
502     lib_path = env['mkl_lib_path']        lib_path = env['mkl_lib_path']
503     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
504  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
505     pass     except KeyError:
506          pass
507    
 if useMPI:  
    mkl_libs = []  
 else:  
508     try:     try:
509        mkl_libs = env['mkl_libs']        mkl_libs = env['mkl_libs']
510     except KeyError:     except KeyError:
511        mkl_libs = []        mkl_libs = []
512    else:
513         mkl_libs = []
514    
515  try:  # ============= set scsl (but only of no MPI) =====================================
516     includes = env['scsl_path']  if not useMPI:
517     env.Append(CPPPATH = [includes,])     try:
518  except KeyError:        includes = env['scsl_path']
519     pass        env.Append(CPPPATH = [includes,])
520       except KeyError:
521          pass
522    
523  try:     try:
524     lib_path = env['scsl_lib_path']        lib_path = env['scsl_lib_path']
525     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
526  except KeyError:        env['ENV']['LD_LIBRARY_PATH']+=":"+lib_path
527     pass     except KeyError:
528          pass
529      
530       try:
531          scsl_libs = env['scsl_libs']
532       except KeyError:
533          scsl_libs = [ ]
534    
535  if useMPI:  else:
536    try:      scsl_libs =  []
     scsl_libs = env['scsl_libs_MPI']  
   except KeyError:  
     scsl_libs = []  
 else:  
   try:  
     scsl_libs = env['scsl_libs']  
   except KeyError:  
     scsl_libs = []  
537    
538  try:  # ============= set TRILINOS (but only with MPI) =====================================
539     includes = env['umf_path']  if useMPI:
540     env.Append(CPPPATH = [includes,])     try:
541  except KeyError:        includes = env['trilinos_path']
542     pass        env.Append(CPPPATH = [includes,])
543       except KeyError:
544          pass
545    
546  try:     try:
547     lib_path = env['umf_lib_path']        lib_path = env['trilinos_lib_path']
548     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
549  except KeyError:     except KeyError:
550     pass        pass
551    
552  if useMPI:     try:
553      umf_libs = []        trilinos_libs = env['trilinos_libs']
554       except KeyError:
555          trilinos_libs = []
556  else:  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:     try:
576        umf_libs = env['umf_libs']        umf_libs = env['umf_libs']
577          umf_libs+=umf_libs
578     except KeyError:     except KeyError:
579        umf_libs = []        pass
580    
581  try:     try:
582     includes = env['ufc_path']        includes = env['ufc_path']
583     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
584  except KeyError:     except KeyError:
585     pass        pass
586    
587  try:     try:
588     includes = env['amd_path']        includes = env['amd_path']
589     env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
590  except KeyError:     except KeyError:
591     pass        pass
592    
593  try:     try:
594     lib_path = env['amd_lib_path']        lib_path = env['amd_lib_path']
595     env.Append(LIBPATH = [lib_path,])        env.Append(LIBPATH = [lib_path,])
596  except KeyError:     except KeyError:
597     pass        pass
598    
 if useMPI:  
     amd_libs = []  
 else:  
599     try:     try:
600        amd_libs = env['amd_libs']        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:     except KeyError:
622        amd_libs = []        trilinos_libs = []
623    else:
624         trilinos_libs = []
625    
626    # ============= set blas =====================================
627  try:  try:
628     includes = env['blas_path']     includes = env['blas_path']
629     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 517  except KeyError: Line 639  except KeyError:
639  try:  try:
640     blas_libs = env['blas_libs']     blas_libs = env['blas_libs']
641  except KeyError:  except KeyError:
642     blas_libs = []     blas_libs = [ ]
643    
644    # ========== netcdf ====================================
645  try:  try:
646     useNetCDF = env['useNetCDF']     useNetCDF = env['useNetCDF']
647  except KeyError:  except KeyError:
648     useNetCDF = 'yes'     useNetCDF = 'yes'
649     pass     pass
650        
 if not useNetCDF == 'yes':  
    print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."  
     
651  if useNetCDF == 'yes':  if useNetCDF == 'yes':
652     try:     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']        includes = env['netCDF_path']
661        env.Append(CPPPATH = [includes,])        env.Append(CPPPATH = [includes,])
662     except KeyError:     except KeyError:
# Line 537  if useNetCDF == 'yes': Line 664  if useNetCDF == 'yes':
664    
665     try:     try:
666        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
       if IS_WINDOWS_PLATFORM: env['ENV']['PATH']+=";"+lib_path  
667        env.Append(LIBPATH = [ lib_path, ])        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:     except KeyError:
672        pass        pass
   
    try:  
       netCDF_libs = env['netCDF_libs']  
    except KeyError:  
       netCDF_libs = [ ]  
673  else:  else:
674       print "Warning: Installation is not configured with netCDF. Some I/O function may not be available."
675     netCDF_libs=[ ]     netCDF_libs=[ ]
676    
677    # ====================== boost ======================================
678  try:  try:
679     includes = env['boost_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['boost_libs_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     boost_libs = env['boost_libs']     boost_lib = env['boost_lib']
693  except KeyError:  except KeyError:
694     boost_libs = None     boost_lib = None
695    # ====================== python ======================================
696  try:  try:
697     includes = env['python_path']     includes = env['python_path']
698     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 570  except KeyError: Line 700  except KeyError:
700     pass     pass
701  try:  try:
702     lib_path = env['python_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     python_libs = env['python_libs']     python_lib = env['python_lib']
709  except KeyError:  except KeyError:
710     python_libs = None     python_lib = None
711    # =============== documentation =======================================
712  try:  try:
713     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
714  except KeyError:  except KeyError:
# Line 585  try: Line 717  try:
717     epydoc_path = env['epydoc_path']     epydoc_path = env['epydoc_path']
718  except KeyError:  except KeyError:
719     epydoc_path = None     epydoc_path = None
720    # =============== PAPI =======================================
721  try:  try:
722     includes = env['papi_path']     includes = env['papi_path']
723     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 599  try: Line 732  try:
732     papi_libs = env['papi_libs']     papi_libs = env['papi_libs']
733  except KeyError:  except KeyError:
734     papi_libs = 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:
769       includes = env['papi_path']
770       env.Append(CPPPATH = [includes,])
771    except KeyError:
772       pass
773    try:
774       lib_path = env['papi_lib_path']
775       env.Append(LIBPATH = [lib_path,])
776    except KeyError:
777       pass
778    try:
779       papi_libs = env['papi_libs']
780    except KeyError:
781       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:
790       doxygen_path = env['doxygen_path']
791    except KeyError:
792       doxygen_path = None
793    try:
794       epydoc_path = env['epydoc_path']
795    except KeyError:
796       epydoc_path = None
797  try:  try:
798     src_zipfile = env.File(env['src_zipfile'])     src_zipfile = env.File(env['src_zipfile'])
799  except KeyError:  except KeyError:
# Line 642  try: Line 835  try:
835  except KeyError:  except KeyError:
836     api_epydoc = None     api_epydoc = None
837    
838    try:
839       api_doxygen = env.Dir(env['api_doxygen'])
840    except KeyError:
841       api_doxygen = None
842    
843    try:
844       svn_pipe = os.popen("svnversion -n .")
845       global_revision = svn_pipe.readlines()
846       svn_pipe.close()
847       global_revision = re.sub(":.*", "", global_revision[0])
848       global_revision = re.sub("[^0-9]", "", global_revision)
849    except:
850       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
857    init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))
858    
859    # 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  # Zipgets
 env.Default(libinstall)  
 env.Default(incinstall)  
 env.Default(pyinstall)  
865  env.Alias('release_src',[ src_zipfile, src_tarfile ])  env.Alias('release_src',[ src_zipfile, src_tarfile ])
866  env.Alias('release_tests',[ test_zipfile, test_tarfile])  env.Alias('release_tests',[ test_zipfile, test_tarfile])
867  env.Alias('release_examples',[ examples_zipfile, examples_tarfile])  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)  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)  env.Alias('guide_pdf', guide_pdf)
874  env.Alias('docs',[ 'release_examples', 'guide_pdf', guide_html_index, api_epydoc])  env.Alias('docs',[ 'release_examples', 'guide_pdf', api_epydoc, api_doxygen, guide_html_index])
875  env.Alias('release', ['release_src', 'release_tests', 'docs'])  env.Alias('release', ['release_src', 'release_tests', 'docs'])
876  env.Alias('build_tests')    # target to build all C++ tests  
877  env.Alias('build_py_tests') # target to build all python tests  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  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  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  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  env.Alias('all_tests', ['run_tests', 'py_tests']) # target to run all C++ and released python tests
883    
 # Python install - esys __init__.py  
 init_target = env.Command(pyinstall+'/__init__.py', None, Touch('$TARGET'))  
 env.Alias(init_target)  
884    
885  # Allow sconscripts to see the env  # Allow sconscripts to see the env
886  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "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",
887      "boost_libs", "python_libs", "doxygen_path", "epydoc_path", "papi_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",          "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", "useMPI" ])          "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  # adds this file and the scons option directore to the source tar
894  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') ]
895  release_testfiles=[env.File('README_TESTS'),]  release_testfiles=[env.File('README_TESTS'),]
896  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
897  env.Zip(test_zipfile, release_testfiles)  env.Zip(test_zipfile, release_testfiles)
# Line 698  env.SConscript(dirs = ['modellib/py_src' Line 916  env.SConscript(dirs = ['modellib/py_src'
916  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  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)  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)  env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)
   
 # added by Ben Cumming  
919  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)
920  #env.SConscript(dirs = ['../test'], build_dir='../test/build', duplicate=0)  #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    install_target = env.Alias("install", env.Flatten([syslib_install_target, syspy_install_target]) )

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

  ViewVC Help
Powered by ViewVC 1.1.26