/[escript]/branches/domexper/SConstruct
ViewVC logotype

Diff of /branches/domexper/SConstruct

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

revision 1132 by ksteube, Thu Apr 12 01:15:01 2007 UTC revision 1133 by gross, Tue May 8 07:19:33 2007 UTC
# Line 4  Line 4 
4  #       Primary Business: Queensland, Australia  #       Primary Business: Queensland, Australia
5  #  Licensed under the Open Software License version 3.0  #  Licensed under the Open Software License version 3.0
6  #     http://www.opensource.org/licenses/osl-3.0.php  #     http://www.opensource.org/licenses/osl-3.0.php
 #  
 #  
 #  
7    
8  # top-level Scons configuration file for all esys13 modules  # top-level Scons configuration file for all esys13 modules
9  # Begin initialisation Section  # Begin initialisation Section
# Line 15  Line 12 
12  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
13  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
14    
15  # import tools:  #===============================================================
16    #   import tools:
17  import glob  import glob
18  import sys, os  import sys, os
19  import socket  import socket
# Line 23  import socket Line 21  import socket
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  # check if UMFPACK is installed on the system:  #===============================================================
25  if os.path.isdir('/opt/UMFPACK/Include') and os.path.isdir('/opt/UMFPACK/Lib'):  #   check on windows or linux platform
26     umf_path_default='/opt/UMFPACK/Include'  #
27     umf_lib_path_default='/opt/UMFPACK/Lib'  IS_WINDOWS_PLATFORM = (os.name== "nt")
28     umf_libs_default=['umfpack']  
29  else:  if IS_WINDOWS_PLATFORM:
30     umf_path_default=None     tools_prefix="C:\\Program Files\\"
31     umf_lib_path_default=None  else:
32     umf_libs_default=None     tools_prefix="/usr/local/"
33    
34  if os.path.isdir('/opt/AMD/Include') and os.path.isdir('/opt/AMD/Lib'):  #==============================================================================================    
35     amd_path_default='/opt/AMD/Include'  #    
36     amd_lib_path_default='/opt/AMD/Lib'  #    get the iinstallation prefix
37     amd_libs_default=['amd']  #
38  else:  prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)
39     amd_path_default=None  print "Install prefix is: ", prefix
40     amd_lib_path_default=None  
    amd_libs_default=None  
   
 if os.path.isdir('/opt/UFconfig'):  
    ufc_path_default='/opt/UFconfig'  
 else:  
    ufc_path_default=None  
   
 if os.path.isdir('/usr/local/include') and os.path.isdir('/usr/local/lib'):  
   netCDF_path_default='/usr/local/include'  
   netCDF_lib_path_default='/usr/local/lib'  
   netCDF_libs_cxx_default=[ 'netcdf_c++', 'netcdf']  
 else:  
   netCDF_path_default=None  
   netCDF_lib_path_default=None  
   netCDF_libs_cxx_default=None  
41  # Default options and options help text  # Default options and options help text
42  # 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.
43  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used  # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used
44  # DO NOT CHANGE THEM HERE  # DO NOT CHANGE THEM HERE
   
45  # Where to install?  # Where to install?
46  prefix = ARGUMENTS.get('prefix', Dir('#.').abspath)  #==============================================================================================    
47  print "Install prefix is: ", prefix  #    
48    #    get the options file if present:
49    #
50  if ARGUMENTS.get('options_file',0):  if ARGUMENTS.get('options_file',0):
51     options_file = ARGUMENTS.get('options_file',0)     options_file = ARGUMENTS.get('options_file',0)
52  else:  else:
# Line 74  else: Line 57  else:
57           hostname+=s           hostname+=s
58        else:        else:
59           hostname+="_"           hostname+="_"
60     options_file = "scons/"+hostname+"_options.py"     options_file = "scons"+os.sep+hostname+"_options.py"
61      
62  if os.path.isfile(options_file):  if os.path.isfile(options_file):
63     print "option file is ",options_file,"."     print "option file is ",options_file,"."
64  else:  else:
65     print "option file is ",options_file, "(not present)."     print "option file is ",options_file, "(not present)."
66    # and load it
67  opts = Options(options_file, ARGUMENTS)  opts = Options(options_file, ARGUMENTS)
68    #================================================================
69    #
70    #   check if UMFPACK is installed on the system:
71    #
72    umf_path_default=None
73    umf_lib_path_default=None
74    umf_libs_default=None
75    if IS_WINDOWS_PLATFORM:
76       pass
77    else:
78       if os.path.isdir('/opt/UMFPACK/Include') and os.path.isdir('/opt/UMFPACK/Lib'):
79          umf_path_default='/opt/UMFPACK/Include'
80          umf_lib_path_default='/opt/UMFPACK/Lib'
81          umf_libs_default=['umfpack']
82    
83    amd_path_default=None
84    amd_lib_path_default=None
85    amd_libs_default=None
86    if IS_WINDOWS_PLATFORM:
87       pass
88    else:
89       if os.path.isdir('/opt/AMD/Include') and os.path.isdir('/opt/AMD/Lib'):
90          amd_path_default='/opt/AMD/Include'
91          amd_lib_path_default='/opt/AMD/Lib'
92          amd_libs_default=['amd']
93    
94    ufc_path_default=None
95    if IS_WINDOWS_PLATFORM:
96       pass
97    else:
98       if os.path.isdir('/opt/UFconfig'):
99            ufc_path_default='/opt/UFconfig'
100    #==========================================================================
101    #
102    #    python installation:
103    #
104    if IS_WINDOWS_PLATFORM:
105       python_path_default='C:\\Program Files\\python%s%s'%(sys.version_info[0],sys.version_info[1])+"\\include"
106       python_lib_path_default='C:\\Program Files\\python%s%s'%(sys.version_info[0],sys.version_info[1])+"\\libs"
107       python_libs_default=["python%s%s"%(sys.version_info[0],sys.version_info[1])]
108    else:
109       python_path_default='/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])
110       python_lib_path_default='/usr/lib'
111       python_libs_default=["python%s.%s"%(sys.version_info[0],sys.version_info[1])]
112    #==========================================================================
113    #
114    #    boost installation:
115    #
116    if IS_WINDOWS_PLATFORM:
117       boost_libs_path_default='C:\\Program Files\\boost\\lib\\'
118       boost_libs_default=None
119       for i in os.listdir(boost_libs_path_default):
120          name=os.path.splitext(i)
121          if name[1] == ".dll" and name[0].startswith("boost_python"):
122              if boost_libs_default == None:
123             boost_libs_default= [ name[0] ]
124          else:
125             if not name[0].find("-gd-"): boost_libs_default=[ name[0] ]
126       boost_path_default='C:\\Program Files\\boost\\include\\boost-%s'%(boost_libs_default[0].split("-")[-1],)
127    else:
128       boost_path_default='/usr/include'
129       boost_libs_path_default='/usr/lib'
130       boost_libs_default=['boost_python']
131    #==========================================================================
132    #
133    #    check if netCDF is installed on the system:
134    #
135    netCDF_path_default=None
136    netCDF_lib_path_default=None
137    netCDF_libs_default=None
138    useNetCDF_default='yes'
139    if os.path.isdir(tools_prefix+'netcdf'+os.sep+'include') and os.path.isdir(tools_prefix+'netcdf'+os.sep+'lib'):
140         netCDF_path_default=tools_prefix+'netcdf'+os.sep+'include'
141         netCDF_lib_path_default=tools_prefix+'netcdf'+os.sep+'lib'
142         netCDF_libs_default=['netcdf_cpp',  'netcdf' ]
143         useNetCDF_default='yes'
144    #==========================================================================
145    #
146    #    compile:
147    #
148    if IS_WINDOWS_PLATFORM:
149        # cc_flags_default  = '/GR /EHsc /MD /Qc99 /Qopenmp /Qopenmp-report1 /O3 /G7 /Qprec /Qpar-report1 /QxP /QaxP'
150        # cc_flags_debug_default  = '/Od /MDd /RTC1 /GR /EHsc /Qc99 /Qopenmp /Qopenmp-report1 /Qprec'
151        cc_flags_default  = '/FD /EHsc /GR  /wd4068 /O2 /Op /MT /W3'
152        cc_flags_debug_default  ='/FD /EHsc /GR  /wd4068 /Od /RTC1 /MTd /ZI'
153        cxx_flags_default = ''
154        cxx_flags_debug_default = ''
155        cc_common_flags = '/FD /EHsc /GR /wd4068 '
156    else:
157       cc_flags_default='-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'
158       cc_flags_debug_default='-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'
159       cxx_flags_default='--no-warn -ansi'
160       cxx_flags_debug_default='--no-warn -ansi -DDOASSERT'
161    #==============================================================================================    
162    # Default options and options help text
163    # These are defaults and can be overridden using command line arguments or an options file.
164    # if the options_file or ARGUMENTS do not exist then the ones listed as default here are used
165    # DO NOT CHANGE THEM HERE
166  opts.AddOptions(  opts.AddOptions(
167  # Where to install esys stuff  # Where to install esys stuff
168    ('incinstall', 'where the esys headers will be installed', prefix+'/include'),    ('incinstall', 'where the esys headers will be installed', prefix+'/include'),
# Line 97  opts.AddOptions( Line 179  opts.AddOptions(
179    ('guide_html', 'name of the directory for user guide in html format', prefix+"/release/doc/user/html"),    ('guide_html', 'name of the directory for user guide in html format', prefix+"/release/doc/user/html"),
180  # Compilation options  # Compilation options
181    BoolOption('dodebug', 'Do you want a debug build?', 'no'),    BoolOption('dodebug', 'Do you want a debug build?', 'no'),
182    ('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),
183    ('cc_defines','C/C++ defines to use', None),    ('cc_defines','C/C++ defines to use', None),
184    ('cc_flags','C compiler flags to use (Release build)', '-O3 -std=c99 -ffast-math -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'),    ('cc_flags','C compiler flags to use (Release build)', cc_flags_default),
185    ('cc_flags_debug', 'C compiler flags to use (Debug build)', '-g -O0 -ffast-math -std=c99 -fpic -Wno-unknown-pragmas -ansi -pedantic-errors'),    ('cc_flags_debug', 'C compiler flags to use (Debug build)', cc_flags_debug_default),
186    ('cxx_flags', 'C++ compiler flags to use (Release build)', '--no-warn -ansi'),    ('cxx_flags', 'C++ compiler flags to use (Release build)', cxx_flags_default),
187    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', '--no-warn -ansi -DDOASSERT -DDOPROF'),    ('cxx_flags_debug', 'C++ compiler flags to use (Debug build)', cxx_flags_debug_default),
   ('cc_flags_MPI','C compiler flags to use (Release MPI build)', '-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias -fno-alias -c99 -w1 -fpic -wd161'),  
   ('cc_flags_debug_MPI', 'C compiler flags to use (Debug MPI build)', '-g -O0 -c99 -w1 -fpic -wd161'),  
   ('cxx_flags_MPI', 'C++ compiler flags to use (Release MPI build)', '-ansi -wd1563 -wd161'),  
   ('cxx_flags_debug_MPI', 'C++ compiler flags to use (Debug MPI build)', '-ansi -DDOASSERT -DDOPROF -wd1563 -wd161'),  
188    ('ar_flags', 'Static library archiver flags to use', None),    ('ar_flags', 'Static library archiver flags to use', None),
189    ('sys_libs', 'System libraries to link with', None),    ('sys_libs', 'System libraries to link with', None),
190    ('tar_flags','flags for zip files','-c -z'),    ('tar_flags','flags for zip files','-c -z'),
# Line 133  opts.AddOptions( Line 211  opts.AddOptions(
211    PathOption('blas_lib_path', 'Path to BLAS libs', None),    PathOption('blas_lib_path', 'Path to BLAS libs', None),
212    ('blas_libs', 'BLAS libraries to link with', None),    ('blas_libs', 'BLAS libraries to link with', None),
213  # netCDF  # netCDF
214    ('useNetCDF', 'switch on/off the usage of netCDF', 'yes'),    ('useNetCDF', 'switch on/off the usage of netCDF', useNetCDF_default),
215    PathOption('netCDF_path', 'Path to netCDF includes', netCDF_path_default),    PathOption('netCDF_path', 'Path to netCDF includes', netCDF_path_default),
216    PathOption('netCDF_lib_path', 'Path to netCDF libs', netCDF_lib_path_default),    PathOption('netCDF_lib_path', 'Path to netCDF libs', netCDF_lib_path_default),
217    ('netCDF_libs_cxx', 'netCDF C++ libraries to link with', netCDF_libs_cxx_default),    ('netCDF_libs', 'netCDF C++ libraries to link with', netCDF_libs_default),
218  # Python  # Python
219  # locations of include files for python  # locations of include files for python
220    PathOption('python_path', 'Path to Python includes', '/usr/include/python%s.%s'%(sys.version_info[0],sys.version_info[1])),    PathOption('python_path', 'Path to Python includes', python_path_default),
221    PathOption('python_lib_path', 'Path to Python libs', '/usr/lib'),    PathOption('python_lib_path', 'Path to Python libs', python_lib_path_default),
222    ('python_lib', 'Python libraries to link with', ["python%s.%s"%(sys.version_info[0],sys.version_info[1]),]),    ('python_libs', 'Python libraries to link with', python_libs_default),
223  # Boost  # Boost
224    PathOption('boost_path', 'Path to Boost includes', '/usr/include'),    PathOption('boost_path', 'Path to Boost includes', boost_path_default),
225    PathOption('boost_lib_path', 'Path to Boost libs', '/usr/lib'),    PathOption('boost_libs_path', 'Path to Boost libs', boost_libs_path_default),
226    ('boost_lib', 'Boost libraries to link with', ['boost_python',]),    ('boost_libs', 'Boost libraries to link with', boost_libs_default),
227  # Doc building  # Doc building
228  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),  #  PathOption('doxygen_path', 'Path to Doxygen executable', None),
229  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),  #  PathOption('epydoc_path', 'Path to Epydoc executable', None),
# Line 156  opts.AddOptions( Line 234  opts.AddOptions(
234  # MPI  # MPI
235    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),    BoolOption('useMPI', 'Compile parallel version using MPI', 'no'),
236  )  )
237  # Note: On the Altix the intel compilers are not automatically  #=================================================================================================
238  # detected by scons intelc.py script. The Altix has a different directory  #
239  # path and in some locations the "modules" facility is used to support  #   Note: On the Altix the intel compilers are not automatically
240  # multiple compiler versions. This forces the need to import the users PATH  #   detected by scons intelc.py script. The Altix has a different directory
241  # environment which isn't the "scons way"  #   path and in some locations the "modules" facility is used to support
242  # 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)  #   multiple compiler versions. This forces the need to import the users PATH
243  # FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix  #   environment which isn't the "scons way"
244    #   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)
245  if os.name != "nt" and os.uname()[4]=='ia64':  #   FIXME: Perhaps a modification to intelc.py will allow better support for ia64 on altix
246     env = Environment(tools = ['default', 'intelc'], options = opts)  #
247     if env['CXX'] == 'icpc':  if IS_WINDOWS_PLATFORM:
248        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 = Environment(tools = ['default', 'msvc'], options = opts)
249  elif os.name == "nt":  else:
250     env = Environment(tools = ['default', 'msvc'], options = opts)     if os.uname()[4]=='ia64':
251     #env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
252  else:        if env['CXX'] == 'icpc':
253     env = Environment(tools = ['default'], options = opts)           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
254  # Initialise Scons Build Environment     else:
255  # check for user environment variables we are interested in        env = Environment(tools = ['default'], options = opts)
256    Help(opts.GenerateHelpText(env))
257    #=================================================================================================
258    #
259    #     Initialise Scons Build Environment
260    #     check for user environment variables we are interested in
261  try:  try:
262     python_path = os.environ['PYTHONPATH']     python_path = os.environ['PYTHONPATH']
263     env['ENV']['PYTHONPATH'] = python_path     env['ENV']['PYTHONPATH'] = python_path
# Line 191  try: Line 274  try:
274     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path     env['ENV']['LD_LIBRARY_PATH'] = ld_library_path
275  except KeyError:  except KeyError:
276     ld_library_path = ''     ld_library_path = ''
277    #==========================================================================
278    #
279  # Setup help for options  #    Add some customer builders
280  Help(opts.GenerateHelpText(env))  #
   
 # Add some customer builders  
281  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)
282  env.Append(BUILDERS = {'PyCompile' : py_builder});  env.Append(BUILDERS = {'PyCompile' : py_builder});
283    
284  if env['PLATFORM'] == "win32":  if IS_WINDOWS_PLATFORM:
285     runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', src_suffix='.exe', single_source=True)     runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', src_suffix='.exe', single_source=True)
286  else:  else:
287     runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', single_source=True)     runUnitTest_builder = Builder(action = scons_extensions.runUnitTest, suffix = '.passed', single_source=True)
# Line 221  try: Line 302  try:
302     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)     env.PrependENVPath('LD_LIBRARY_PATH', libinstall)
303     if env['PLATFORM'] == "win32":     if env['PLATFORM'] == "win32":
304        env.PrependENVPath('PATH', libinstall)        env.PrependENVPath('PATH', libinstall)
305        env.PrependENVPath('PATH', env['boost_lib_path'])        env.PrependENVPath('PATH', env['boost_libs_path'])
306  except KeyError:  except KeyError:
307     libinstall = None     libinstall = None
308  try:  try:
# Line 243  try: Line 324  try:
324  except KeyError:  except KeyError:
325     pass     pass
326    
 if 'shake71' == socket.gethostname().split('.')[0]:  
   if useMPI:  
     env['CC'] = 'mpicc'  
     env['CXX'] = 'mpiCC'  
   
327  if dodebug:  if dodebug:
328    if useMPI:    if useMPI:
329      try:      try:
# Line 308  except KeyError: Line 384  except KeyError:
384  try:  try:
385     sys_libs = env['sys_libs']     sys_libs = env['sys_libs']
386  except KeyError:  except KeyError:
387     sys_libs = ''     sys_libs = []
388    
389  try:  try:
390     tar_flags = env['tar_flags']     tar_flags = env['tar_flags']
# Line 329  except KeyError: Line 405  except KeyError:
405     pass     pass
406    
407  if useMPI:  if useMPI:
408     mkl_libs = ''     mkl_libs = []
409  else:  else:
410     try:     try:
411        mkl_libs = env['mkl_libs']        mkl_libs = env['mkl_libs']
412     except KeyError:     except KeyError:
413        mkl_libs = ''        mkl_libs = []
414    
415  try:  try:
416     includes = env['scsl_path']     includes = env['scsl_path']
# Line 352  if useMPI: Line 428  if useMPI:
428    try:    try:
429      scsl_libs = env['scsl_libs_MPI']      scsl_libs = env['scsl_libs_MPI']
430    except KeyError:    except KeyError:
431      scsl_libs = ''      scsl_libs = []
432  else:  else:
433    try:    try:
434      scsl_libs = env['scsl_libs']      scsl_libs = env['scsl_libs']
435    except KeyError:    except KeyError:
436      scsl_libs = ''      scsl_libs = []
437    
438  try:  try:
439     includes = env['umf_path']     includes = env['umf_path']
# Line 372  except KeyError: Line 448  except KeyError:
448     pass     pass
449    
450  if useMPI:  if useMPI:
451      umf_libs = ''      umf_libs = []
452  else:  else:
453     try:     try:
454        umf_libs = env['umf_libs']        umf_libs = env['umf_libs']
455     except KeyError:     except KeyError:
456        umf_libs = ''        umf_libs = []
457    
458  try:  try:
459     includes = env['ufc_path']     includes = env['ufc_path']
# Line 398  except KeyError: Line 474  except KeyError:
474     pass     pass
475    
476  if useMPI:  if useMPI:
477      amd_libs = ''      amd_libs = []
478  else:  else:
479     try:     try:
480        amd_libs = env['amd_libs']        amd_libs = env['amd_libs']
481     except KeyError:     except KeyError:
482        amd_libs = ''        amd_libs = []
483    
484  try:  try:
485     includes = env['blas_path']     includes = env['blas_path']
# Line 420  except KeyError: Line 496  except KeyError:
496  try:  try:
497     blas_libs = env['blas_libs']     blas_libs = env['blas_libs']
498  except KeyError:  except KeyError:
499     blas_libs = ''     blas_libs = []
500    
501  try:  try:
502     useNetCDF = env['useNetCDF']     useNetCDF = env['useNetCDF']
# Line 440  if useNetCDF == 'yes': Line 516  if useNetCDF == 'yes':
516    
517     try:     try:
518        lib_path = env['netCDF_lib_path']        lib_path = env['netCDF_lib_path']
519        env.Append(LIBPATH = [lib_path,])        if IS_WINDOWS_PLATFORM: env['ENV']['PATH']+=";"+lib_path
520          env.Append(LIBPATH = [ lib_path, ])
521     except KeyError:     except KeyError:
522        pass        pass
523    
524     try:     try:
525        netCDF_libs_cxx = env['netCDF_libs_cxx']        netCDF_libs = env['netCDF_libs']
526     except KeyError:     except KeyError:
527        netCDF_libs_cxx = [ ]        netCDF_libs = [ ]
528  else:  else:
529     netCDF_libs_cxx=[ ]     netCDF_libs=[ ]
530    
531  try:  try:
532     includes = env['boost_path']     includes = env['boost_path']
# Line 457  try: Line 534  try:
534  except KeyError:  except KeyError:
535     pass     pass
536  try:  try:
537     lib_path = env['boost_lib_path']     lib_path = env['boost_libs_path']
538     env.Append(LIBPATH = [lib_path,])     env.Append(LIBPATH = [lib_path,])
539  except KeyError:  except KeyError:
540     pass     pass
541  try:  try:
542     boost_lib = env['boost_lib']     boost_libs = env['boost_libs']
543  except KeyError:  except KeyError:
544     boost_lib = None     boost_libs = None
545  try:  try:
546     includes = env['python_path']     includes = env['python_path']
547     env.Append(CPPPATH = [includes,])     env.Append(CPPPATH = [includes,])
# Line 476  try: Line 553  try:
553  except KeyError:  except KeyError:
554     pass     pass
555  try:  try:
556     python_lib = env['python_lib']     python_libs = env['python_libs']
557  except KeyError:  except KeyError:
558     python_lib = None     python_libs = None
559  try:  try:
560     doxygen_path = env['doxygen_path']     doxygen_path = env['doxygen_path']
561  except KeyError:  except KeyError:
# Line 545  except KeyError: Line 622  except KeyError:
622     api_epydoc = None     api_epydoc = None
623    
624  # Zipgets  # Zipgets
   
625  env.Default(libinstall)  env.Default(libinstall)
626  env.Default(incinstall)  env.Default(incinstall)
627  env.Default(pyinstall)  env.Default(pyinstall)
# Line 568  init_target = env.Command(pyinstall+'/__ Line 644  init_target = env.Command(pyinstall+'/__
644  env.Alias(init_target)  env.Alias(init_target)
645    
646  # Allow sconscripts to see the env  # Allow sconscripts to see the env
647  Export(["env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs_cxx", "useNetCDF",  Export(["IS_WINDOWS_PLATFORM", "env", "incinstall", "libinstall", "pyinstall", "dodebug", "mkl_libs", "scsl_libs", "umf_libs", "amd_libs", "blas_libs", "netCDF_libs", "useNetCDF",
648      "boost_lib", "python_lib", "doxygen_path", "epydoc_path", "papi_libs",      "boost_libs", "python_libs", "doxygen_path", "epydoc_path", "papi_libs",
649          "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",
650          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI"])          "guide_pdf", "guide_html_index", "api_epydoc", "useMPI" ])
651    
652  # End initialisation section  # End initialisation section
653  # Begin configuration section  # Begin configuration section
# Line 580  release_srcfiles=[env.File('SConstruct') Line 656  release_srcfiles=[env.File('SConstruct')
656  release_testfiles=[env.File('README_TESTS'),]  release_testfiles=[env.File('README_TESTS'),]
657  env.Zip(src_zipfile, release_srcfiles)  env.Zip(src_zipfile, release_srcfiles)
658  env.Zip(test_zipfile, release_testfiles)  env.Zip(test_zipfile, release_testfiles)
659  env.Tar(src_tarfile, release_srcfiles)  try:
660  env.Tar(test_tarfile, release_testfiles)     env.Tar(src_tarfile, release_srcfiles)
661       env.Tar(test_tarfile, release_testfiles)
662    except AttributeError:
663       pass
664  # Insert new components to be build here  # Insert new components to be build here
665  # FIXME: might be nice to replace this verbosity with a list of targets and some  # FIXME: might be nice to replace this verbosity with a list of targets and some
666  # FIXME: nifty python to create the lengthy but very similar env.Sconscript lines  # FIXME: nifty python to create the lengthy but very similar env.Sconscript lines

Legend:
Removed from v.1132  
changed lines
  Added in v.1133

  ViewVC Help
Powered by ViewVC 1.1.26