/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2820 by artak, Thu Dec 10 05:03:11 2009 UTC revision 3178 by caltinay, Tue Sep 14 00:31:59 2010 UTC
# Line 1  Line 1 
1    
2  ########################################################  ########################################################
3  #  #
4  # Copyright (c) 2003-2009 by University of Queensland  # Copyright (c) 2003-2010 by University of Queensland
5  # Earth Systems Science Computational Center (ESSCC)  # Earth Systems Science Computational Center (ESSCC)
6  # http://www.uq.edu.au/esscc  # http://www.uq.edu.au/esscc
7  #  #
# Line 86  adder( Line 86  adder(
86    BoolVariable('usedebug', 'Do you want a debug build?', 'no'),    BoolVariable('usedebug', 'Do you want a debug build?', 'no'),
87    BoolVariable('usevtk', 'Do you want to use VTK?', 'yes'),    BoolVariable('usevtk', 'Do you want to use VTK?', 'yes'),
88    ('options_file', 'File of paths/options. Default: scons/<hostname>_options.py', options_file),    ('options_file', 'File of paths/options. Default: scons/<hostname>_options.py', options_file),
89      ('cc', 'path to C compiler', 'DEFAULT'),
90      ('cxx', 'path to C++ compiler', 'DEFAULT'),
91    ('win_cc_name', 'windows C compiler name if needed', 'msvc'),    ('win_cc_name', 'windows C compiler name if needed', 'msvc'),
92    # The strings -DDEFAULT_ get replaced by scons/<hostname>_options.py or by defaults below    # The strings -DDEFAULT_ get replaced by scons/<hostname>_options.py or by defaults below
93    ('cc_flags', 'C compiler flags to use', '-DEFAULT_1'),    ('cc_flags', 'C/C++ compiler flags to use', '-DEFAULT_1'),
94    ('cc_optim', 'C compiler optimization flags to use', '-DEFAULT_2'),    ('cc_optim', 'C/C++ optimization flags to use', '-DEFAULT_2'),
95    ('cc_debug', 'C compiler debug flags to use', '-DEFAULT_3'),    ('cc_debug', 'C/C++ debug flags to use', '-DEFAULT_3'),
96    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),    ('omp_optim', 'OpenMP compiler flags to use (Release build)', '-DEFAULT_4'),
97    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),    ('omp_debug', 'OpenMP compiler flags to use (Debug build)', '-DEFAULT_5'),
98    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),    ('omp_libs', 'OpenMP compiler libraries to link with', '-DEFAULT_6'),
99    ('cc_extra', 'Extra C/C++ flags', ''),    ('cc_extra', 'Extra C compiler flags', ''),
100      ('cxx_extra', 'Extra C++ compiler flags', ''),
101    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
102    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
103    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
# Line 153  adder( Line 156  adder(
156    ('silo_path', 'Path to Silo includes', '/usr/include'),    ('silo_path', 'Path to Silo includes', '/usr/include'),
157    ('silo_lib_path', 'Path to Silo libs', usr_lib),    ('silo_lib_path', 'Path to Silo libs', usr_lib),
158    ('silo_libs', 'Silo libraries to link with', ['siloh5', 'hdf5']),    ('silo_libs', 'Silo libraries to link with', ['siloh5', 'hdf5']),
159    # VisIt
160      BoolVariable('usevisit', 'switch on/off the usage of the VisIt sim library', 'no'),
161      ('visit_path', 'Path to VisIt libsim includes', '/usr/include'),
162      ('visit_lib_path', 'Path to VisIt sim library', usr_lib),
163  # AMD (used by UMFPACK)  # AMD (used by UMFPACK)
164    ('amd_path', 'Path to AMD includes', '/usr/include/suitesparse'),    ('amd_path', 'Path to AMD includes', '/usr/include/suitesparse'),
165    ('amd_lib_path', 'Path to AMD libs', usr_lib),    ('amd_lib_path', 'Path to AMD libs', usr_lib),
# Line 168  adder( Line 175  adder(
175    ('lapack_libs', 'Lapack libraries to link with', []),    ('lapack_libs', 'Lapack libraries to link with', []),
176    ('lapack_type', '{clapack,mkl}','clapack'),    ('lapack_type', '{clapack,mkl}','clapack'),
177  # An option for specifying the compiler tools set (see windows branch).  # An option for specifying the compiler tools set (see windows branch).
178    ('tools_names', 'allow control over the tools in the env setup', ['intelc']),    ('tools_names', 'allow control over the tools in the env setup', ['default']),
179  # finer control over library building, intel aggressive global optimisation  # finer control over library building, intel aggressive global optimisation
180  # works with dynamic libraries on windows.  # works with dynamic libraries on windows.
181    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),    ('share_esysUtils', 'control static or dynamic esysUtils lib', False),
182    ('share_paso', 'control static or dynamic paso lib', False),    ('share_paso', 'control static or dynamic paso lib', False),
183    ('env_export','Environment variables to be passed to children',[])    ('env_export','Environment variables to be passed to children',[]),
184    #To enable passing function pointers through python
185      BoolVariable('iknowwhatimdoing','allow nonstandard C',False)
186  )  )
187    
188    
189    ###################
190    
191    # This is only to support old versions of scons which don't accept
192    # the variant_dir parameter (older than 0.98 I think).
193    # Once these are no longer an issue we can go back to a direct call
194    # to obj.SConscript
195    import SCons
196    vs=SCons.__version__.split('.')
197    cantusevariantdir=float(vs[0]+'.'+vs[1])<0.98
198    
199    
200    def CallSConscript(obj, **kw):
201        if cantusevariantdir:
202            if 'variant_dir' in kw:
203            kw['build_dir']=kw['variant_dir']
204            del kw['variant_dir']
205        obj.SConscript(**kw)
206    
207    
208  ############ Specify which compilers to use ####################  ############ Specify which compilers to use ####################
209    
# Line 188  if IS_WINDOWS_PLATFORM: Line 215  if IS_WINDOWS_PLATFORM:
215        env = Environment(tools = ['default'] + env['tools_names'],        env = Environment(tools = ['default'] + env['tools_names'],
216                          options = opts)                          options = opts)
217  else:  else:
218     if effective_hostname == 'service0':     if os.uname()[4]=='ia64':
       env = Environment(tools = ['default', 'intelc'], options = opts)  
    elif os.uname()[4]=='ia64':  
219        env = Environment(tools = ['default', 'intelc'], options = opts)        env = Environment(tools = ['default', 'intelc'], options = opts)
220        if env['CXX'] == 'icpc':        if env['CXX'] == 'icpc':
221           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)           env['LINK'] = env['CXX'] # version >=9 of intel c++ compiler requires use of icpc to link in C++ runtimes (icc does not)
222     else:     else:
223        env = Environment(tools = ['default'], options = opts)        env = Environment(tools = ['default'], options = opts)
224  Help(opts.GenerateHelpText(env))        if env['tools_names']!='default':
225        env=Environment(tools = ['default'] +env['tools_names'], options=opts)
226    
227    # Override compiler choice if provided
228    if env['cc'] != 'DEFAULT': env['CC']=env['cc']
229    if env['cxx'] != 'DEFAULT': env['CXX']=env['cxx']
230    
231    Help(opts.GenerateHelpText(env))
232    
233  ############ Make sure target directories exist ################  ############ Make sure target directories exist ################
234    
# Line 224  if env['useMPI']: env['usempi'] = 1 Line 255  if env['useMPI']: env['usempi'] = 1
255    
256  sysheaderopt = ""       # how do we indicate that a header is a system header. Use "" for no action.  sysheaderopt = ""       # how do we indicate that a header is a system header. Use "" for no action.
257    
258    cc_flags = ""
259    cc_optim = ""
260    cc_debug = ""
261    omp_optim = ""
262    omp_debug = ""
263    omp_libs = []
264    
265  if env["CC"] == "icc":  if env["CC"] == "icc":
266    # Intel compilers    # Intel compilers
267    cc_flags      = "-fPIC -ansi -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"    cc_flags      = "-std=c99 -fPIC -wd161 -w1 -vec-report0 -DBLOCKTIMER -DCORE_ID1"
268    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias"    cc_optim      = "-O3 -ftz -IPF_ftlacc- -IPF_fma -fno-alias -ip"
269    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
270    omp_optim     = "-openmp -openmp_report0"    omp_optim     = "-openmp -openmp_report0"
271    omp_debug     = "-openmp -openmp_report0"    omp_debug     = "-openmp -openmp_report0"
# Line 235  if env["CC"] == "icc": Line 273  if env["CC"] == "icc":
273    pedantic      = ""    pedantic      = ""
274    fatalwarning      = ""        # Switch to turn warnings into errors    fatalwarning      = ""        # Switch to turn warnings into errors
275    sysheaderopt      = ""    sysheaderopt      = ""
276  elif env["CC"] == "gcc":  elif env["CC"][:3] == "gcc":
277    # GNU C on any system    # GNU C on any system
278    cc_flags      = "-pedantic -Wall -fPIC -ansi -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing"    cc_flags      = "-pedantic -Wall -fPIC -ffast-math -Wno-unknown-pragmas -DBLOCKTIMER  -Wno-sign-compare -Wno-system-headers -Wno-long-long -Wno-strict-aliasing -finline-functions"
279  #the long long warning occurs on the Mac  #the long long warning occurs on the Mac
280    cc_optim      = "-O3"    cc_optim      = "-O3"
281    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
# Line 291  if env['forcecollres']    != "leave_alon Line 329  if env['forcecollres']    != "leave_alon
329      env.Append(CPPDEFINES=['FRESCOLLECTOFF'])      env.Append(CPPDEFINES=['FRESCOLLECTOFF'])
330    
331    
332    if env['iknowwhatimdoing']:
333        env.Append(CPPDEFINES=['IKNOWWHATIMDOING'])
334    
335  # OpenMP is disabled if useopenmp=no or both variables omp_optim and omp_debug are empty  # OpenMP is disabled if useopenmp=no or both variables omp_optim and omp_debug are empty
336  if not env["useopenmp"]:  if not env["useopenmp"]:
337    env['omp_optim'] = ""    env['omp_optim'] = ""
# Line 370  env.Append(CPPPATH     = [Dir('include')]) Line 411  env.Append(CPPPATH     = [Dir('include')])
411  # Add cc option -L<Escript>/trunk/lib  # Add cc option -L<Escript>/trunk/lib
412  env.Append(LIBPATH      = [Dir(env['libinstall'])])  env.Append(LIBPATH      = [Dir(env['libinstall'])])
413    
414  if env['cc_extra'] != '': env.Append(CCFLAGS = env['cc_extra'])  if env['cc_extra'] != '': env.Append(CFLAGS = env['cc_extra'])
415    if env['cxx_extra'] != '': env.Append(CXXFLAGS = env['cxx_extra'])
416  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])  if env['ld_extra'] != '': env.Append(LINKFLAGS = env['ld_extra'])
417    
418  if env['usepedantic']: env.Append(CCFLAGS = pedantic)  if env['usepedantic']: env.Append(CCFLAGS = pedantic)
# Line 461  conf.env.PrependENVPath(LD_LIBRARY_PATH_ Line 503  conf.env.PrependENVPath(LD_LIBRARY_PATH_
503  conf.env.PrependENVPath('PYTHONPATH', prefix)  conf.env.PrependENVPath('PYTHONPATH', prefix)
504  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])  conf.env.PrependENVPath(LD_LIBRARY_PATH_KEY, env['libinstall'])
505    
 if not conf.CheckCXXHeader('boost/python.hpp'):  
   print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])  
   sys.exit(1)  
506    
507  if not conf.CheckFunc('PyObject_SetAttr'):  #Yep we still cant figure this one out. - working on it.
508    print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])  if not IS_WINDOWS_PLATFORM:
509    sys.exit(1)    if not conf.CheckCXXHeader('boost/python.hpp'):
510        print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
511        sys.exit(1)
512    
513      if not conf.CheckFunc('PyObject_SetAttr'):
514        print "Cannot find boost library method PyObject_SetAttr (tried method PyObject_SetAttr in library %s in directory %s)" % (env['boost_libs'], env['boost_lib_path'])
515        sys.exit(1)
516    
517    
518  # Commit changes to environment  # Commit changes to environment
519  env = conf.Finish()  env = conf.Finish()
# Line 604  if env['usesilo']: Line 650  if env['usesilo']:
650    
651  # Add the path to Silo to environment env if it was found.  # Add the path to Silo to environment env if it was found.
652  # Note that we do not add the libs since they are only needed for the  # Note that we do not add the libs since they are only needed for the
653  # escriptexport library and tools.  # weipa library and tools.
654  if env['usesilo']:  if env['usesilo']:
655    env.AppendUnique(CPPPATH = [env['silo_path']])    env.AppendUnique(CPPPATH = [env['silo_path']])
656    env.AppendUnique(LIBPATH = [env['silo_lib_path']])    env.AppendUnique(LIBPATH = [env['silo_lib_path']])
   env.Append(CPPDEFINES = ['USE_SILO'])  
657    
658  ########### Lapack (optional) ##################################  ############ VisIt (optional) ###################################
659    
660    if env['usevisit']:
661      env.AppendUnique(CPPPATH = [env['visit_path']])
662      env.AppendUnique(LIBPATH = [env['visit_lib_path']])
663    
664    ########### Lapack (optional) ##################################
665    
666  if env['uselapack']:  if env['uselapack']:
667      env.AppendUnique(CPPDEFINES='USE_LAPACK')      env.AppendUnique(CPPDEFINES='USE_LAPACK')
# Line 628  if env['uselapack']: Line 678  if env['uselapack']:
678          env.AppendUnique(CPPDEFINES='MKL_LAPACK')          env.AppendUnique(CPPDEFINES='MKL_LAPACK')
679                
680    
   
681  ############ Add the compiler flags ############################  ############ Add the compiler flags ############################
682    
683  # Enable debug by choosing either cc_debug or cc_optim  # Enable debug by choosing either cc_debug or cc_optim
# Line 685  if env_mpi['usempi'] and not conf.CheckC Line 734  if env_mpi['usempi'] and not conf.CheckC
734  if env_mpi['usempi']:  if env_mpi['usempi']:
735    env_mpi = conf.Finish()    env_mpi = conf.Finish()
736    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])    env_mpi.Append(CPPDEFINES = ['PASO_MPI', 'MPI_NO_CPPBIND', env_mpi['MPICH_IGNORE_CXX_SEEK']])
737      # NetCDF 4.1 defines MPI_Comm et al. if MPI_INCLUDED is not defined!
738      # On the other hand MPT and OpenMPI don't define the latter so we have to
739      # do that here
740      if env['usenetcdf'] and env_mpi['mpi_flavour'] in ["MPT","OPENMPI"]:
741        env_mpi.Append(CPPDEFINES = ['MPI_INCLUDED'])
742  else:  else:
743    conf.Finish()    conf.Finish()
744    
745  env['usempi'] = env_mpi['usempi']  env['usempi'] = env_mpi['usempi']
746    
   
747  ############ ParMETIS (optional) ###############################  ############ ParMETIS (optional) ###############################
748    
749  # Start a new configure environment that reflects what we've already found  # Start a new configure environment that reflects what we've already found
# Line 719  else: Line 772  else:
772    
773  env['useparmetis'] = env_mpi['useparmetis']  env['useparmetis'] = env_mpi['useparmetis']
774    
 ############ Now we switch on Warnings as errors ###############  
   
 #this needs to be done after configuration because the scons test files have warnings in them  
   
 if ((fatalwarning != "") and (env['usewarnings'])):  
   env.Append(CCFLAGS        = fatalwarning)  
   env_mpi.Append(CCFLAGS        = fatalwarning)  
   
775  ############ Summarize our environment #########################  ############ Summarize our environment #########################
776    
777  print ""  print ""
# Line 738  if env['usenetcdf']: print "   Using NetCD Line 783  if env['usenetcdf']: print "   Using NetCD
783  else: print "   Not using NetCDF"  else: print "   Not using NetCDF"
784  if env['usevtk']: print "   Using VTK"  if env['usevtk']: print "   Using VTK"
785  else: print "   Not using VTK"  else: print "   Not using VTK"
786    if env['usevisit']: print " Using VisIt"
787    else: print "   Not using VisIt"
788  if env['usemkl']: print "   Using MKL"  if env['usemkl']: print "   Using MKL"
789  else: print "   Not using MKL"  else: print "   Not using MKL"
790  if env['useumfpack']: print "   Using UMFPACK"  if env['useumfpack']: print "   Using UMFPACK"
# Line 766  print "" Line 813  print ""
813  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.debug")))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.debug")))
814  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.mpi")))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.mpi")))
815  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.openmp")))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.openmp")))
 Execute(Delete(os.path.join(env['libinstall'],"pyversion")))  
816  Execute(Delete(os.path.join(env['libinstall'],"buildvars")))  Execute(Delete(os.path.join(env['libinstall'],"buildvars")))
817  if not env['usempi']: Execute(Delete(os.path.join(env['libinstall'],"pythonMPI")))  if not env['usempi']: Execute(Delete(os.path.join(env['libinstall'],"pythonMPI")))
818    
819    
820  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
821    
822    if env['usepedantic']: env_mpi.Append(CCFLAGS = pedantic)
823    
824    
825  from grouptest import *  from grouptest import *
826    
827  TestGroups=[]  TestGroups=[]
828    
829    dodgy_env=clone_env(env_mpi)    # Environment without pedantic options
830    
831    ############ Now we switch on Warnings as errors ###############
832    
833    #this needs to be done after configuration because the scons test files have warnings in them
834    
835    if ((fatalwarning != "") and (env['usewarnings'])):
836      env.Append(CCFLAGS        = fatalwarning)
837      env_mpi.Append(CCFLAGS        = fatalwarning)
838    
839    
840  Export(  Export(
841    ["env",    ["env",
842     "env_mpi",     "env_mpi",
843     "clone_env",     "clone_env",
844       "dodgy_env",
845     "IS_WINDOWS_PLATFORM",     "IS_WINDOWS_PLATFORM",
846     "TestGroups"     "TestGroups",
847       "CallSConscript",
848       "cantusevariantdir"
849     ]     ]
850    )    )
851    
852  env.SConscript(dirs = ['tools/CppUnitTest/src'], build_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  CallSConscript(env, dirs = ['tools/CppUnitTest/src'], variant_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)
853  env.SConscript(dirs = ['tools/escriptconvert'], build_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)  CallSConscript(env, dirs = ['tools/escriptconvert'], variant_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)
854  env.SConscript(dirs = ['paso/src'], build_dir='build/$PLATFORM/paso', duplicate=0)  CallSConscript(env, dirs = ['paso/src'], variant_dir='build/$PLATFORM/paso', duplicate=0)
855  env.SConscript(dirs = ['dataexporter/src'], build_dir='build/$PLATFORM/dataexporter', duplicate=0)  CallSConscript(env, dirs = ['weipa/src'], variant_dir='build/$PLATFORM/weipa', duplicate=0)
856  env.SConscript(dirs = ['escript/src'], build_dir='build/$PLATFORM/escript', duplicate=0)  CallSConscript(env, dirs = ['escript/src'], variant_dir='build/$PLATFORM/escript', duplicate=0)
857  env.SConscript(dirs = ['esysUtils/src'], build_dir='build/$PLATFORM/esysUtils', duplicate=0)  CallSConscript(env, dirs = ['esysUtils/src'], variant_dir='build/$PLATFORM/esysUtils', duplicate=0)
858  env.SConscript(dirs = ['finley/src'], build_dir='build/$PLATFORM/finley', duplicate=0)  CallSConscript(env, dirs = ['finley/src'], variant_dir='build/$PLATFORM/finley', duplicate=0)
859  env.SConscript(dirs = ['modellib/py_src'], build_dir='build/$PLATFORM/modellib', duplicate=0)  CallSConscript(env, dirs = ['modellib/py_src'], variant_dir='build/$PLATFORM/modellib', duplicate=0)
860  env.SConscript(dirs = ['doc'], build_dir='build/$PLATFORM/doc', duplicate=0)  CallSConscript(env, dirs = ['doc'], variant_dir='build/$PLATFORM/doc', duplicate=0)
861  env.SConscript(dirs = ['pyvisi/py_src'], build_dir='build/$PLATFORM/pyvisi', duplicate=0)  CallSConscript(env, dirs = ['pyvisi/py_src'], variant_dir='build/$PLATFORM/pyvisi', duplicate=0)
862  env.SConscript(dirs = ['pycad/py_src'], build_dir='build/$PLATFORM/pycad', duplicate=0)  CallSConscript(env, dirs = ['pycad/py_src'], variant_dir='build/$PLATFORM/pycad', duplicate=0)
863  env.SConscript(dirs = ['pythonMPI/src'], build_dir='build/$PLATFORM/pythonMPI', duplicate=0)  CallSConscript(env, dirs = ['pythonMPI/src'], variant_dir='build/$PLATFORM/pythonMPI', duplicate=0)
864  env.SConscript(dirs = ['scripts'], build_dir='build/$PLATFORM/scripts', duplicate=0)  CallSConscript(env, dirs = ['scripts'], variant_dir='build/$PLATFORM/scripts', duplicate=0)
865  env.SConscript(dirs = ['paso/profiling'], build_dir='build/$PLATFORM/paso/profiling', duplicate=0)  CallSConscript(env, dirs = ['paso/profiling'], variant_dir='build/$PLATFORM/paso/profiling', duplicate=0)
866    
867    
868  ############ Remember what optimizations we used ###############  ############ Remember what optimizations we used ###############
# Line 823  env.Alias('remember_options', remember_l Line 886  env.Alias('remember_options', remember_l
886  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
887    
888    versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])    versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])
889    if sys.version_info[4] >0 : versionstring+="rc%s"%sys.version_info[4]  #  if sys.version_info[4] >0 : versionstring+="rc%s"%sys.version_info[4]
   os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))  
890    
891  ############## Populate the buildvars file #####################  ############## Populate the buildvars file #####################
892    
# Line 870  if env['usesilo']: Line 932  if env['usesilo']:
932     out+="y"     out+="y"
933  else:  else:
934     out+="n"     out+="n"
935    out+="\nusevisit="
936    if env['usevisit']:
937       out+="y"
938    else:
939       out+="n"
940  buildvars.write(out+"\n")  buildvars.write(out+"\n")
941  buildvars.close()  buildvars.close()
942    
# Line 886  env.Alias('install_esysUtils', ['build_e Line 953  env.Alias('install_esysUtils', ['build_e
953  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])  env.Alias('build_paso', ['target_install_paso_headers', 'target_paso_a'])
954  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])  env.Alias('install_paso', ['build_paso', 'target_install_paso_a'])
955    
956  env.Alias('build_dataexporter', ['target_install_escriptexport_headers', 'target_escriptexport_so', 'target_escriptexportcpp_so'])  env.Alias('build_weipa', ['target_install_weipa_headers', 'target_weipa_so', 'target_weipacpp_so'])
957  env.Alias('install_dataexporter', ['build_dataexporter', 'target_install_escriptexport_so', 'target_install_escriptexportcpp_so', 'target_install_dataexporter_py'])  env.Alias('install_weipa', ['build_weipa', 'target_install_weipa_so', 'target_install_weipacpp_so', 'target_install_weipa_py'])
958    
959    
960    env.Alias('build_escriptreader', ['target_install_weipa_headers', 'target_escriptreader_a'])
961    env.Alias('install_escriptreader', ['build_escriptreader', 'target_install_escriptreader_a'])
962    
963  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])  env.Alias('build_escript', ['target_install_escript_headers', 'target_escript_so', 'target_escriptcpp_so'])
964  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])  env.Alias('install_escript', ['build_escript', 'target_install_escript_so', 'target_install_escriptcpp_so', 'target_install_escript_py'])
# Line 899  env.Alias('install_finley', ['build_finl Line 970  env.Alias('install_finley', ['build_finl
970  build_all_list = []  build_all_list = []
971  build_all_list += ['build_esysUtils']  build_all_list += ['build_esysUtils']
972  build_all_list += ['build_paso']  build_all_list += ['build_paso']
973  build_all_list += ['build_dataexporter']  build_all_list += ['build_weipa']
974  build_all_list += ['build_escript']  build_all_list += ['build_escript']
975  build_all_list += ['build_finley']  build_all_list += ['build_finley']
976  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
977  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']  #if not IS_WINDOWS_PLATFORM:    build_all_list += ['target_escript_wrapper']
978  if env['usesilo']:  build_all_list += ['target_escriptconvert']  build_all_list += ['target_escriptconvert']
979  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
980    
981  install_all_list = []  install_all_list = []
982  install_all_list += ['target_init']  install_all_list += ['target_init']
983  install_all_list += ['install_esysUtils']  install_all_list += ['install_esysUtils']
984  install_all_list += ['install_paso']  install_all_list += ['install_paso']
985  install_all_list += ['install_dataexporter']  install_all_list += ['install_weipa']
986  install_all_list += ['install_escript']  install_all_list += ['install_escript']
987  install_all_list += ['install_finley']  install_all_list += ['install_finley']
988  install_all_list += ['target_install_pyvisi_py']  install_all_list += ['target_install_pyvisi_py']
# Line 939  env.Alias('build_full',['install_all','b Line 1010  env.Alias('build_full',['install_all','b
1010    
1011  env.Alias('api_epydoc','install_all')  env.Alias('api_epydoc','install_all')
1012    
1013  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf', 'cookbook_pdf'])
1014    
1015    build_platform=os.name
1016    
1017  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
1018     try:     try:
1019      utest=open("utest.sh","w")      utest=open("utest.sh","w")
1020      build_platform=os.name      #Sometimes Mac python says it is posix      #Sometimes Mac python says it is posix
1021      if (build_platform=='posix') and platform.system()=="Darwin":      if (build_platform=='posix') and platform.system()=="Darwin":
1022          build_platform='darwin'          build_platform='darwin'
1023      utest.write(GroupTest.makeHeader(build_platform))      utest.write(GroupTest.makeHeader(build_platform))
# Line 965  if not IS_WINDOWS_PLATFORM: Line 1038  if not IS_WINDOWS_PLATFORM:
1038  ############ Targets to build PasoTests suite ################  ############ Targets to build PasoTests suite ################
1039    
1040  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')  env.Alias('build_PasoTests','build/'+build_platform+'/paso/profiling/PasoTests')
1041    
1042    env.Alias('release_prep', ['docs', 'install_all'])
Legend:
Removed from v.2820  
changed lines
  Added in v.3178
  ViewVC Help
Powered by ViewVC 1.1.26