/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 2235 by jfenwick, Tue Feb 3 01:47:47 2009 UTC revision 2334 by jfenwick, Thu Mar 26 03:05:33 2009 UTC
# Line 15  Line 15 
15  EnsureSConsVersion(0,96,91)  EnsureSConsVersion(0,96,91)
16  EnsurePythonVersion(2,3)  EnsurePythonVersion(2,3)
17    
18  import sys, os, re, socket  import sys, os, re, socket, platform, stat
19    
20  # Add our extensions  # Add our extensions
21  if os.path.isdir('scons'): sys.path.append('scons')  if os.path.isdir('scons'): sys.path.append('scons')
# Line 72  opts.AddOptions( Line 72  opts.AddOptions(
72    ('ld_extra', 'Extra linker flags', ''),    ('ld_extra', 'Extra linker flags', ''),
73    ('sys_libs', 'System libraries to link with', []),    ('sys_libs', 'System libraries to link with', []),
74    ('ar_flags', 'Static library archiver flags to use', ''),    ('ar_flags', 'Static library archiver flags to use', ''),
75    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'yes'),    BoolOption('useopenmp', 'Compile parallel version using OpenMP', 'no'),
76    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),    BoolOption('usepedantic', 'Compile with -pedantic if using gcc', 'no'),
77    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),    BoolOption('usewarnings','Compile with warnings as errors if using gcc','yes'),
78      ('forcelazy','for testing use only - set the default value for autolazy','leave_alone'),
79  # Python  # Python
80    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),    ('python_path', 'Path to Python includes', '/usr/include/'+python_version),
81    ('python_lib_path', 'Path to Python libs', usr_lib),    ('python_lib_path', 'Path to Python libs', usr_lib),
# Line 188  elif env["CC"] == "gcc": Line 189  elif env["CC"] == "gcc":
189  #the long long warning occurs on the Mac  #the long long warning occurs on the Mac
190    cc_optim      = "-O3"    cc_optim      = "-O3"
191    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"    cc_debug      = "-g -O0 -DDOASSERT -DDOPROF -DBOUNDS_CHECK"
192    omp_optim     = ""    omp_optim     = "-fopenmp"
193    omp_debug     = ""    omp_debug     = "-fopenmp"
194    omp_libs      = []    omp_libs      = ['gomp']
195    pedantic      = "-pedantic-errors -Wno-long-long"    pedantic      = "-pedantic-errors -Wno-long-long"
196    fatalwarning      = "-Werror"    fatalwarning      = "-Werror"
197    sysheaderopt      = "-isystem "    sysheaderopt      = "-isystem "
# Line 220  if env["omp_optim"]    == "-DEFAULT_4": env Line 221  if env["omp_optim"]    == "-DEFAULT_4": env
221  if env["omp_debug"] == "-DEFAULT_5": env['omp_debug'] = omp_debug  if env["omp_debug"] == "-DEFAULT_5": env['omp_debug'] = omp_debug
222  if env["omp_libs"]  == "-DEFAULT_6": env['omp_libs'] = omp_libs  if env["omp_libs"]  == "-DEFAULT_6": env['omp_libs'] = omp_libs
223    
224    #set up the autolazy values
225    if env['forcelazy']    != "leave_alone":
226      if env['forcelazy'] == 'on':
227        env.Append(CPPDEFINES='FAUTOLAZYON')
228      else:
229         if env['forcelazy'] == 'off':
230        env.Append(CPPDEFINES='FAUTOLAZYOFF')
231    
232  # 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
233  if not env["useopenmp"]:  if not env["useopenmp"]:
234    env['omp_optim'] = ""    env['omp_optim'] = ""
# Line 287  if env['usepedantic']: env.Append(CCFLAG Line 296  if env['usepedantic']: env.Append(CCFLAG
296    
297  # MS Windows  # MS Windows
298  if IS_WINDOWS_PLATFORM:  if IS_WINDOWS_PLATFORM:
299    env.PrependENVPath('PATH',    [env['boost_lib_path']])    env.AppendENVPath('PATH', [env['boost_lib_path']])
300    env.PrependENVPath('PATH',    [env['libinstall']])    env.AppendENVPath('PATH', [env['libinstall']])
301    if not env['share_esysUtils'] :    if not env['share_esysUtils'] :
302      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])      env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
303    if not env['share_paso'] :    if not env['share_paso'] :
304      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])      env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
305    
306    if env['usenetcdf']:    if env['usenetcdf']:
307      env.PrependENVPath('PATH',  [env['netCDF_lib_path']])      env.AppendENVPath('PATH',   [env['netCDF_lib_path']])
308    
309  env.Append(ARFLAGS = env['ar_flags'])  env.Append(ARFLAGS = env['ar_flags'])
310    
# Line 324  conf = Configure(clone_env(env)) Line 333  conf = Configure(clone_env(env))
333    
334  # Test that the compiler is working  # Test that the compiler is working
335  if not conf.CheckFunc('printf'):  if not conf.CheckFunc('printf'):
336    print "Cannot run C compiler '%s' (or libc is missing)" % (env['CC'])     print "Cannot run C compiler '%s' (or libc is missing)" % (env['CC'])
337    sys.exit(1)     sys.exit(1)
338    
339  if conf.CheckFunc('gethostname'):  if conf.CheckFunc('gethostname'):
340    conf.env.Append(CPPDEFINES = ['HAVE_GETHOSTNAME'])    conf.env.Append(CPPDEFINES = ['HAVE_GETHOSTNAME'])
# Line 342  conf.env.AppendUnique(LIBPATH      = [env['p Line 351  conf.env.AppendUnique(LIBPATH      = [env['p
351  conf.env.AppendUnique(LIBS      = [env['python_libs']])  conf.env.AppendUnique(LIBS      = [env['python_libs']])
352    
353  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['python_lib_path'])  # The wrapper script needs to find these libs  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['python_lib_path'])  # The wrapper script needs to find these libs
354    conf.env.PrependENVPath('PYTHONPATH', prefix)
355    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
356    
357  if not conf.CheckCHeader('Python.h'):  if not conf.CheckCHeader('Python.h'):
358    print "Cannot find python include files (tried 'Python.h' in directory %s)" % (env['python_path'])    print "Cannot find python include files (tried 'Python.h' in directory %s)" % (env['python_path'])
359    sys.exit(1)    sys.exit(1)
360  if not conf.CheckFunc('Py_Main'):  if not conf.CheckFunc('Py_Exit'):
361    print "Cannot find python library method Py_Main (tried lib %s in directory %s)" % (env['python_libs'], env['python_lib_path'])    print "Cannot find python library method Py_Main (tried lib %s in directory %s)" % (env['python_libs'], env['python_lib_path'])
362    sys.exit(1)    sys.exit(1)
363    
364  ############ boost (required) ##################################  ############ boost (required) ##################################
365    
366  if not sysheaderopt =="":  if not sysheaderopt =="":
367    conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path']+'boost')  # This is required because we can't -isystem /usr/system because it breaks std includes
368      if os.path.normpath(env['boost_path']) =="/usr/include":
369        conf.env.Append(CCFLAGS=sysheaderopt+os.path.join(env['boost_path'],'boost'))
370      else:
371        conf.env.Append(CCFLAGS=sysheaderopt+env['boost_path'])
372  else:  else:
373    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])    conf.env.AppendUnique(CPPPATH     = [env['boost_path']])
374    
# Line 361  conf.env.AppendUnique(LIBPATH      = [env['b Line 376  conf.env.AppendUnique(LIBPATH      = [env['b
376  conf.env.AppendUnique(LIBS      = [env['boost_libs']])  conf.env.AppendUnique(LIBS      = [env['boost_libs']])
377    
378  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['boost_lib_path'])   # The wrapper script needs to find these libs  conf.env.PrependENVPath('LD_LIBRARY_PATH', env['boost_lib_path'])   # The wrapper script needs to find these libs
379    #ensure that our path entries remain at the front
380    conf.env.PrependENVPath('PYTHONPATH', prefix)
381    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
382    
383  if not conf.CheckCXXHeader('boost/python.hpp'):  if not conf.CheckCXXHeader('boost/python.hpp'):
384    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])    print "Cannot find boost include files (tried boost/python.hpp in directory %s)" % (env['boost_path'])
385    sys.exit(1)    sys.exit(1)
386    
387  if not conf.CheckFunc('PyObject_SetAttr'):  if not conf.CheckFunc('PyObject_SetAttr'):
388    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'])    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'])
389    sys.exit(1)    sys.exit(1)
# Line 389  if env['usevtk']: Line 408  if env['usevtk']:
408    
409  conf = Configure(clone_env(env))  conf = Configure(clone_env(env))
410    
411    print "<1<<<<"+str(conf.env['ENV']['LD_LIBRARY_PATH'])
412    
413    
414  if env['usenetcdf']:  if env['usenetcdf']:
415    conf.env.AppendUnique(CPPPATH = [env['netCDF_path']])    conf.env.AppendUnique(CPPPATH = [env['netCDF_path']])
416    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['netCDF_lib_path']])
417    conf.env.AppendUnique(LIBS    = [env['netCDF_libs']])    conf.env.AppendUnique(LIBS    = [env['netCDF_libs']])
418    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['netCDF_lib_path'])    # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['netCDF_lib_path'])    # The wrapper script needs to find these libs
419      #ensure that our path entries remain at the front
420      conf.env.PrependENVPath('PYTHONPATH', prefix)
421      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
422    
423  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckCHeader('netcdf.h'): env['usenetcdf'] = 0
424  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0  if env['usenetcdf'] and not conf.CheckFunc('nc_open'): env['usenetcdf'] = 0
425    
426    print "<2<<<<"+str(conf.env['ENV']['LD_LIBRARY_PATH'])
427    
428  # Add NetCDF to environment env if it was found  # Add NetCDF to environment env if it was found
429  if env['usenetcdf']:  if env['usenetcdf']:
430    env = conf.Finish()    env = conf.Finish()
# Line 405  if env['usenetcdf']: Line 432  if env['usenetcdf']:
432  else:  else:
433    conf.Finish()    conf.Finish()
434    
435    print "<A<<<<"+str(env['ENV']['LD_LIBRARY_PATH'])
436    
437  ############ PAPI (optional) ###################################  ############ PAPI (optional) ###################################
438    
439  # 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 415  if env['usepapi']: Line 444  if env['usepapi']:
444    conf.env.AppendUnique(LIBPATH = [env['papi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['papi_lib_path']])
445    conf.env.AppendUnique(LIBS    = [env['papi_libs']])    conf.env.AppendUnique(LIBS    = [env['papi_libs']])
446    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['papi_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['papi_lib_path'])  # The wrapper script needs to find these libs
447      #ensure that our path entries remain at the front
448      conf.env.PrependENVPath('PYTHONPATH', prefix)
449      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
450    
451  if env['usepapi'] and not conf.CheckCHeader('papi.h'): env['usepapi'] = 0  if env['usepapi'] and not conf.CheckCHeader('papi.h'): env['usepapi'] = 0
452  if env['usepapi'] and not conf.CheckFunc('PAPI_start_counters'): env['usepapi'] = 0  if env['usepapi'] and not conf.CheckFunc('PAPI_start_counters'): env['usepapi'] = 0
# Line 436  if env['usemkl']: Line 468  if env['usemkl']:
468    conf.env.AppendUnique(LIBPATH = [env['mkl_lib_path']])    conf.env.AppendUnique(LIBPATH = [env['mkl_lib_path']])
469    conf.env.AppendUnique(LIBS    = [env['mkl_libs']])    conf.env.AppendUnique(LIBS    = [env['mkl_libs']])
470    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mkl_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mkl_lib_path'])   # The wrapper script needs to find these libs
471      #ensure that our path entries remain at the front
472      conf.env.PrependENVPath('PYTHONPATH', prefix)
473      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
474    
475  if env['usemkl'] and not conf.CheckCHeader('mkl_solver.h'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckCHeader('mkl_solver.h'): env['usemkl'] = 0
476  if env['usemkl'] and not conf.CheckFunc('pardiso_'): env['usemkl'] = 0  if env['usemkl'] and not conf.CheckFunc('pardiso_'): env['usemkl'] = 0
# Line 466  if env['useumfpack']: Line 501  if env['useumfpack']:
501    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['umf_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['umf_lib_path'])   # The wrapper script needs to find these libs
502    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['amd_lib_path'])   # The wrapper script needs to find these libs
503    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['blas_lib_path'])  # The wrapper script needs to find these libs
504      #ensure that our path entries remain at the front
505      conf.env.PrependENVPath('PYTHONPATH', prefix)
506      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
507    
 if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0  
508  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0  if env['useumfpack'] and not conf.CheckFunc('umfpack_di_symbolic'): env['useumfpack'] = 0
509  if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?  if env['useumfpack'] and not conf.CheckCHeader('umfpack.h'): env['useumfpack'] = 0
510    # if env['useumfpack'] and not conf.CheckFunc('daxpy'): env['useumfpack'] = 0 # this does not work on shake73?
511    
512  # Add UMFPACK to environment env if it was found  # Add UMFPACK to environment env if it was found
513  if env['useumfpack']:  if env['useumfpack']:
# Line 536  if env_mpi['usempi']: Line 574  if env_mpi['usempi']:
574    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['mpi_lib_path']])
575    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['mpi_libs']])
576    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mpi_lib_path'])   # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['mpi_lib_path'])   # The wrapper script needs to find these libs
577      #ensure that our path entries remain at the front
578      conf.env.PrependENVPath('PYTHONPATH', prefix)
579      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
580    
581  if env_mpi['usempi'] and not conf.CheckCHeader('mpi.h'): env_mpi['usempi'] = 0  if env_mpi['usempi'] and not conf.CheckCHeader('mpi.h'): env_mpi['usempi'] = 0
582  if env_mpi['usempi'] and not conf.CheckFunc('MPI_Init'): env_mpi['usempi'] = 0  # if env_mpi['usempi'] and not conf.CheckFunc('MPI_Init'): env_mpi['usempi'] = 0
583    
584  # Add MPI to environment env_mpi if it was found  # Add MPI to environment env_mpi if it was found
585  if env_mpi['usempi']:  if env_mpi['usempi']:
# Line 561  if env_mpi['useparmetis']: Line 602  if env_mpi['useparmetis']:
602    conf.env.AppendUnique(LIBPATH = [env_mpi['parmetis_lib_path']])    conf.env.AppendUnique(LIBPATH = [env_mpi['parmetis_lib_path']])
603    conf.env.AppendUnique(LIBS    = [env_mpi['parmetis_libs']])    conf.env.AppendUnique(LIBS    = [env_mpi['parmetis_libs']])
604    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['parmetis_lib_path'])  # The wrapper script needs to find these libs    conf.env.PrependENVPath('LD_LIBRARY_PATH', env['parmetis_lib_path'])  # The wrapper script needs to find these libs
605      #ensure that our path entries remain at the front
606      conf.env.PrependENVPath('PYTHONPATH', prefix)
607      conf.env.PrependENVPath('LD_LIBRARY_PATH', env['libinstall'])
608    
609  if env_mpi['useparmetis'] and not conf.CheckCHeader('parmetis.h'): env_mpi['useparmetis'] = 0  if env_mpi['useparmetis'] and not conf.CheckCHeader('parmetis.h'): env_mpi['useparmetis'] = 0
610  if env_mpi['useparmetis'] and not conf.CheckFunc('ParMETIS_V3_PartGeomKway'): env_mpi['useparmetis'] = 0  if env_mpi['useparmetis'] and not conf.CheckFunc('ParMETIS_V3_PartGeomKway'): env_mpi['useparmetis'] = 0
# Line 616  print "" Line 660  print ""
660    
661  ############ Delete option-dependent files #####################  ############ Delete option-dependent files #####################
662    
663  Execute(Delete(env['libinstall'] + "/Compiled.with.debug"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.debug")))
664  Execute(Delete(env['libinstall'] + "/Compiled.with.mpi"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.mpi")))
665  Execute(Delete(env['libinstall'] + "/Compiled.with.openmp"))  Execute(Delete(os.path.join(env['libinstall'],"Compiled.with.openmp")))
666  if not env['usempi']: Execute(Delete(env['libinstall'] + "/pythonMPI"))  Execute(Delete(os.path.join(env['libinstall'],"pyversion")))
667    Execute(Delete(os.path.join(env['libinstall'],"buildvars")))
668    if not env['usempi']: Execute(Delete(os.path.join(env['libinstall'],"pythonMPI")))
669    
670    
671  ############ Build the subdirectories ##########################  ############ Build the subdirectories ##########################
# Line 657  env.SConscript(dirs = ['paso/profiling'] Line 703  env.SConscript(dirs = ['paso/profiling']
703  remember_list = []  remember_list = []
704    
705  if env['usedebug']:  if env['usedebug']:
706    remember_list += env.Command(env['libinstall'] + "/Compiled.with.debug", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.debug"), None, Touch('$TARGET'))
707    
708  if env['usempi']:  if env['usempi']:
709    remember_list += env.Command(env['libinstall'] + "/Compiled.with.mpi", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.mpi"), None, Touch('$TARGET'))
710    
711  if env['omp_optim'] != '':  if env['useopenmp']:
712    remember_list += env.Command(env['libinstall'] + "/Compiled.with.openmp", None, Touch('$TARGET'))    remember_list += env.Command(os.path.join(env['libinstall'],"Compiled.with.openmp"), None, Touch('$TARGET'))
713    
714  env.Alias('remember_options', remember_list)  env.Alias('remember_options', remember_list)
715    
716    
717    ############### Record python interpreter version ##############
718    
719    if not IS_WINDOWS_PLATFORM:
720      versionstring="Python "+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])
721      os.system("echo "+versionstring+" > "+os.path.join(env['libinstall'],"pyversion"))
722    
723    ############## Populate the buildvars file #####################
724    
725    buildvars=open(os.path.join(env['libinstall'],'buildvars'),'w')
726    buildvars.write('python='+str(sys.version_info[0])+"."+str(sys.version_info[1])+"."+str(sys.version_info[2])+'\n')
727    
728    # Find the boost version by extracting it from version.hpp
729    boosthpp=open(os.path.join(env['boost_path'],'boost','version.hpp'))
730    boostversion='unknown'
731    try:
732        for line in boosthpp:
733            ver=re.match(r'#define BOOST_VERSION (\d+)',line)
734            if ver:
735                boostversion=ver.group(1)
736    except StopIteration:
737        pass
738    buildvars.write("boost="+boostversion+"\n")
739    buildvars.write("svn_revision="+str(global_revision)+"\n")
740    out="usedebug="
741    if env['usedebug']:
742        out+="y"
743    else:
744        out+="n"
745    out+="\nusempi="
746    if env['usempi']:
747        out+="y"
748    else:
749        out+="n"
750    out+="\nuseopenmp="
751    if env['useopenmp']:
752        out+="y"
753    else:
754        out+="n"
755    buildvars.write(out+"\n")
756    
757    buildvars.close()
758    
759    
760  ############ Targets to build and install libraries ############  ############ Targets to build and install libraries ############
761    
762  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))
# Line 692  build_all_list += ['build_paso'] Line 782  build_all_list += ['build_paso']
782  build_all_list += ['build_escript']  build_all_list += ['build_escript']
783  build_all_list += ['build_finley']  build_all_list += ['build_finley']
784  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']  if env['usempi']:       build_all_list += ['target_pythonMPI_exe']
785  if not IS_WINDOWS_PLATFORM: build_all_list += ['target_finley_wrapper']  if not IS_WINDOWS_PLATFORM: build_all_list += ['target_escript_wrapper']
786  if env['usesilo']:  build_all_list += ['target_escript2silo']  if env['usesilo']:  build_all_list += ['target_escript2silo']
787  env.Alias('build_all', build_all_list)  env.Alias('build_all', build_all_list)
788    
# Line 706  install_all_list += ['target_install_pyv Line 796  install_all_list += ['target_install_pyv
796  install_all_list += ['target_install_modellib_py']  install_all_list += ['target_install_modellib_py']
797  install_all_list += ['target_install_pycad_py']  install_all_list += ['target_install_pycad_py']
798  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']  if env['usempi']:       install_all_list += ['target_install_pythonMPI_exe']
799  if not IS_WINDOWS_PLATFORM: install_all_list += ['target_install_finley_wrapper']  if not IS_WINDOWS_PLATFORM: install_all_list += ['target_install_escript_wrapper']
800  if env['usesilo']:  install_all_list += ['target_install_escript2silo']  if env['usesilo']:  install_all_list += ['target_install_escript2silo']
801  install_all_list += ['remember_options']  install_all_list += ['remember_options']
802  env.Alias('install_all', install_all_list)  env.Alias('install_all', install_all_list)
# Line 720  env.Alias('build_cppunittest', ['target_ Line 810  env.Alias('build_cppunittest', ['target_
810  env.Alias('install_cppunittest', ['build_cppunittest', 'target_install_cppunittest_a'])  env.Alias('install_cppunittest', ['build_cppunittest', 'target_install_cppunittest_a'])
811  env.Alias('run_tests', ['install_all', 'target_install_cppunittest_a'])  env.Alias('run_tests', ['install_all', 'target_install_cppunittest_a'])
812  env.Alias('all_tests', ['install_all', 'target_install_cppunittest_a', 'run_tests', 'py_tests'])  env.Alias('all_tests', ['install_all', 'target_install_cppunittest_a', 'run_tests', 'py_tests'])
813    env.Alias('build_full',['install_all','build_tests','build_py_tests'])
814    
815  ############ Targets to build the documentation ################  ############ Targets to build the documentation ################
816    
817  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf'])
818    
819  if not IS_WINDOWS_PLATFORM:  if not IS_WINDOWS_PLATFORM:
820     try:     try:
821      utest=open("utest.sh","w")      utest=open("utest.sh","w")
822      utest.write(makeHeader())      build_platform=os.name      #Sometimes Mac python says it is posix
823        if (build_platform=='posix') and platform.system()=="Darwin":
824            build_platform='darwin'
825        utest.write(GroupTest.makeHeader(build_platform))
826      for tests in TestGroups:      for tests in TestGroups:
827          utest.write(tests.makeString())          utest.write(tests.makeString())
828      utest.close()      utest.close()
829        os.chmod("utest.sh",stat.S_IRWXU|stat.S_IRGRP|stat.S_IXGRP|stat.S_IROTH|stat.S_IXOTH)
830      print "utest.sh written"      print "utest.sh written"
831     except IOError:     except IOError:
832      print "Error attempting to write unittests file."      print "Error attempting to write unittests file."

Legend:
Removed from v.2235  
changed lines
  Added in v.2334

  ViewVC Help
Powered by ViewVC 1.1.26