/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 3271 by caltinay, Thu Oct 14 02:16:00 2010 UTC revision 3604 by caltinay, Mon Sep 19 04:47:53 2011 UTC
# Line 19  from site_init import * Line 19  from site_init import *
19    
20  # Version number to check for in options file. Increment when new features are  # Version number to check for in options file. Increment when new features are
21  # added or existing options changed.  # added or existing options changed.
22  REQUIRED_OPTS_VERSION=200  REQUIRED_OPTS_VERSION=201
23    
24  # MS Windows support, many thanks to PH  # MS Windows support, many thanks to PH
25  IS_WINDOWS = (os.name == 'nt')  IS_WINDOWS = (os.name == 'nt')
# Line 54  vars = Variables(options_file, ARGUMENTS Line 54  vars = Variables(options_file, ARGUMENTS
54  vars.AddVariables(  vars.AddVariables(
55    PathVariable('options_file', 'Path to options file', options_file, PathVariable.PathIsFile),    PathVariable('options_file', 'Path to options file', options_file, PathVariable.PathIsFile),
56    PathVariable('prefix', 'Installation prefix', Dir('#.').abspath, PathVariable.PathIsDirCreate),    PathVariable('prefix', 'Installation prefix', Dir('#.').abspath, PathVariable.PathIsDirCreate),
57      PathVariable('build_dir', 'Top-level build directory', Dir('#/build').abspath, PathVariable.PathIsDirCreate),
58    BoolVariable('verbose', 'Output full compile/link lines', False),    BoolVariable('verbose', 'Output full compile/link lines', False),
59  # Compiler/Linker options  # Compiler/Linker options
60    ('cc', 'Path to C compiler', 'default'),    ('cc', 'Path to C compiler', 'default'),
# Line 71  vars.AddVariables( Line 72  vars.AddVariables(
72    ('omp_ldflags', 'OpenMP linker flags', 'default'),    ('omp_ldflags', 'OpenMP linker flags', 'default'),
73  # Mandatory libraries  # Mandatory libraries
74    ('boost_prefix', 'Prefix/Paths of boost installation', default_prefix),    ('boost_prefix', 'Prefix/Paths of boost installation', default_prefix),
75    ('boost_libs', 'Boost libraries to link with', ['boost_python']),    ('boost_libs', 'Boost libraries to link with', ['boost_python-mt']),
76    # Mandatory for tests
77      ('cppunit_prefix', 'Prefix/Paths of CppUnit installation', default_prefix),
78      ('cppunit_libs', 'CppUnit libraries to link with', ['cppunit']),
79  # Optional libraries and options  # Optional libraries and options
80    EnumVariable('mpi', 'Compile parallel version using MPI flavour', 'none', allowed_values=mpi_flavours),    EnumVariable('mpi', 'Compile parallel version using MPI flavour', 'none', allowed_values=mpi_flavours),
81    ('mpi_prefix', 'Prefix/Paths of MPI installation', default_prefix),    ('mpi_prefix', 'Prefix/Paths of MPI installation', default_prefix),
# Line 92  vars.AddVariables( Line 96  vars.AddVariables(
96    BoolVariable('umfpack', 'Enable UMFPACK', False),    BoolVariable('umfpack', 'Enable UMFPACK', False),
97    ('umfpack_prefix', 'Prefix/Paths to UMFPACK installation', default_prefix),    ('umfpack_prefix', 'Prefix/Paths to UMFPACK installation', default_prefix),
98    ('umfpack_libs', 'UMFPACK libraries to link with', ['umfpack']),    ('umfpack_libs', 'UMFPACK libraries to link with', ['umfpack']),
99      BoolVariable('boomeramg', 'Enable BoomerAMG', False),
100      ('boomeramg_prefix', 'Prefix/Paths to BoomerAMG installation', default_prefix),
101      ('boomeramg_libs', 'BoomerAMG libraries to link with', ['boomeramg']),
102    EnumVariable('lapack', 'Set LAPACK flavour', 'none', allowed_values=lapack_flavours),    EnumVariable('lapack', 'Set LAPACK flavour', 'none', allowed_values=lapack_flavours),
103    ('lapack_prefix', 'Prefix/Paths to LAPACK installation', default_prefix),    ('lapack_prefix', 'Prefix/Paths to LAPACK installation', default_prefix),
104    ('lapack_libs', 'LAPACK libraries to link with', []),    ('lapack_libs', 'LAPACK libraries to link with', []),
# Line 102  vars.AddVariables( Line 109  vars.AddVariables(
109    ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix),    ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix),
110    ('visit_libs', 'VisIt libraries to link with', ['simV2']),    ('visit_libs', 'VisIt libraries to link with', ['simV2']),
111    BoolVariable('pyvisi', 'Enable pyvisi (deprecated, requires VTK module)', False),    BoolVariable('pyvisi', 'Enable pyvisi (deprecated, requires VTK module)', False),
112      BoolVariable('vsl_random', 'Use VSL from intel for random data', False),
113  # Advanced settings  # Advanced settings
114    #dudley_assemble_flags = -funroll-loops      to actually do something    #dudley_assemble_flags = -funroll-loops      to actually do something
115    ('dudley_assemble_flags', 'compiler flags for some dudley optimisations', ''),    ('dudley_assemble_flags', 'compiler flags for some dudley optimisations', ''),
# Line 114  vars.AddVariables( Line 122  vars.AddVariables(
122    EnumVariable('forcecollres', 'For testing use only - set the default value for force resolving collective ops', 'leave_alone', allowed_values=('leave_alone', 'on', 'off')),    EnumVariable('forcecollres', 'For testing use only - set the default value for force resolving collective ops', 'leave_alone', allowed_values=('leave_alone', 'on', 'off')),
123    # finer control over library building, intel aggressive global optimisation    # finer control over library building, intel aggressive global optimisation
124    # works with dynamic libraries on windows.    # works with dynamic libraries on windows.
125    ('share_esysutils', 'Build a dynamic esysUtils library', False),    ('build_shared', 'Build dynamic libraries only', False),
   ('share_paso', 'Build a dynamic paso library', False),  
126    ('sys_libs', 'Extra libraries to link with', []),    ('sys_libs', 'Extra libraries to link with', []),
127    ('escript_opts_version', 'Version of options file (do not specify on command line)'),    ('escript_opts_version', 'Version of options file (do not specify on command line)'),
128  )  )
# Line 125  vars.AddVariables( Line 132  vars.AddVariables(
132  # Intel's compiler uses regular expressions improperly and emits a warning  # Intel's compiler uses regular expressions improperly and emits a warning
133  # about failing to find the compilers. This warning can be safely ignored.  # about failing to find the compilers. This warning can be safely ignored.
134    
135  env = Environment(tools = ['default'], options = vars)  # PATH is needed so the compiler, linker and tools are found if they are not
136    # in default locations.
137    env = Environment(tools = ['default'], options = vars,
138                      ENV = {'PATH': os.environ['PATH']})
139  if env['tools_names'] != 'default':  if env['tools_names'] != 'default':
140      env = Environment(tools = ['default'] + env['tools_names'], options = vars)      env = Environment(tools = ['default'] + env['tools_names'], options = vars,
141                          ENV = {'PATH' : os.environ['PATH']})
142    
143  if options_file:  if options_file:
144      opts_valid=False      opts_valid=False
# Line 153  if len(vars.UnknownVariables())>0: Line 164  if len(vars.UnknownVariables())>0:
164    
165  #################### Make sure install directories exist #####################  #################### Make sure install directories exist #####################
166    
167    env['BUILD_DIR']=env['build_dir']
168  prefix=Dir(env['prefix']).abspath  prefix=Dir(env['prefix']).abspath
169  env['incinstall'] = os.path.join(prefix, 'include')  env['incinstall'] = os.path.join(prefix, 'include')
170  env['bininstall'] = os.path.join(prefix, 'bin')  env['bininstall'] = os.path.join(prefix, 'bin')
# Line 283  env['svn_revision']=global_revision Line 295  env['svn_revision']=global_revision
295  env.Append(CPPDEFINES=['SVN_VERSION='+global_revision])  env.Append(CPPDEFINES=['SVN_VERSION='+global_revision])
296    
297  if IS_WINDOWS:  if IS_WINDOWS:
298      if not env['share_esysutils']:      if not env['build_shared']:
299          env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])          env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
     if not env['share_paso']:  
300          env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])          env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
301    
302  ###################### Copy required environment vars ########################  ###################### Copy required environment vars ########################
# Line 297  if IS_WINDOWS: Line 308  if IS_WINDOWS:
308  else:  else:
309      LD_LIBRARY_PATH_KEY='LD_LIBRARY_PATH'      LD_LIBRARY_PATH_KEY='LD_LIBRARY_PATH'
310    
311  # the following env variables are exported for the unit tests, PATH is needed  # the following env variables are exported for the unit tests
 # so the compiler/linker is found if they are not in default locations.  
312    
313  for key in 'OMP_NUM_THREADS', 'ESCRIPT_NUM_PROCS', 'ESCRIPT_NUM_NODES':  for key in 'OMP_NUM_THREADS', 'ESCRIPT_NUM_PROCS', 'ESCRIPT_NUM_NODES':
314      try:      try:
# Line 307  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N Line 317  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N
317          env['ENV'][key] = 1          env['ENV'][key] = 1
318    
319  env_export=env['env_export']  env_export=env['env_export']
320  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME'])  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME','TMPDIR','TEMP','TMP'])
321    
322  for key in set(env_export):  for key in set(env_export):
323      try:      try:
# Line 376  if conf.CheckFunc('gethostname'): Line 386  if conf.CheckFunc('gethostname'):
386  python_inc_path=sysconfig.get_python_inc()  python_inc_path=sysconfig.get_python_inc()
387  if IS_WINDOWS:  if IS_WINDOWS:
388      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')
389    elif env['PLATFORM']=='darwin':
390        python_lib_path=sysconfig.get_config_var('LIBPL')
391  else:  else:
392      python_lib_path=sysconfig.get_config_var('LIBDIR')      python_lib_path=sysconfig.get_config_var('LIBDIR')
393  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux
# Line 429  except ImportError: Line 441  except ImportError:
441      print("Cannot import numpy, you need to set your PYTHONPATH and probably %s"%LD_LIBRARY_PATH_KEY)      print("Cannot import numpy, you need to set your PYTHONPATH and probably %s"%LD_LIBRARY_PATH_KEY)
442      Exit(1)      Exit(1)
443    
444    ######## CppUnit (required for tests)
445    
446    try:
447        cppunit_inc_path,cppunit_lib_path=findLibWithHeader(env, env['cppunit_libs'], 'cppunit/TestFixture.h', env['cppunit_prefix'], lang='c++')
448        env.AppendUnique(CPPPATH = [cppunit_inc_path])
449        env.AppendUnique(LIBPATH = [cppunit_lib_path])
450        env.PrependENVPath(LD_LIBRARY_PATH_KEY, cppunit_lib_path)
451        env['cppunit']=True
452    except:
453        env['cppunit']=False
454    
455  ######## VTK (optional)  ######## VTK (optional)
456    
457  if env['pyvisi']:  if env['pyvisi']:
# Line 519  if env['silo']: Line 542  if env['silo']:
542      # weipa library and tools.      # weipa library and tools.
543      #env.AppendUnique(LIBS = [env['silo_libs']])      #env.AppendUnique(LIBS = [env['silo_libs']])
544    
545    ######## VSL random numbers (optional)
546    if env['vsl_random']:
547        env.Append(CPPDEFINES = ['MKLRANDOM'])
548    
549  ######## VisIt (optional)  ######## VisIt (optional)
550    
551  visit_inc_path=''  visit_inc_path=''
# Line 546  if env['usempi']: Line 573  if env['usempi']:
573      if env['netcdf'] and env['mpi'] in ['MPT','OPENMPI']:      if env['netcdf'] and env['mpi'] in ['MPT','OPENMPI']:
574          env.Append(CPPDEFINES = ['MPI_INCLUDED'])          env.Append(CPPDEFINES = ['MPI_INCLUDED'])
575    
576    ######## BOOMERAMG (optional)
577    
578    if env['mpi'] == 'none': env['boomeramg'] = False
579    
580    boomeramg_inc_path=''
581    boomeramg_lib_path=''
582    if env['boomeramg']:
583        boomeramg_inc_path,boomeramg_lib_path=findLibWithHeader(env, env['boomeramg_libs'], 'HYPRE.h', env['boomeramg_prefix'], lang='c')
584        env.AppendUnique(CPPPATH = [boomeramg_inc_path])
585        env.AppendUnique(LIBPATH = [boomeramg_lib_path])
586        env.AppendUnique(LIBS = env['boomeramg_libs'])
587        env.PrependENVPath(LD_LIBRARY_PATH_KEY, boomeramg_lib_path)
588        env.Append(CPPDEFINES = ['BOOMERAMG'])
589    
590  ######## ParMETIS (optional)  ######## ParMETIS (optional)
591    
592  if not env['usempi']: env['parmetis'] = False  if not env['usempi']: env['parmetis'] = False
# Line 560  if env['parmetis']: Line 601  if env['parmetis']:
601      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)
602      env.Append(CPPDEFINES = ['USE_PARMETIS'])      env.Append(CPPDEFINES = ['USE_PARMETIS'])
603    
604    ######## gmsh (optional, for tests)
605    
606    try:
607        import subprocess
608        p=subprocess.Popen(['gmsh', '-info'], stderr=subprocess.PIPE)
609        _,e=p.communicate()
610        if e.split().count("MPI"):
611            env['gmsh']='m'
612        else:
613            env['gmsh']='s'
614    except OSError:
615        env['gmsh']=False
616    
617    ######## PDFLaTeX (for documentation)
618    if 'PDF' in dir(env) and '.tex' in env.PDF.builder.src_suffixes(env):
619        env['pdflatex']=True
620    else:
621        env['pdflatex']=False
622    
623  ######################## Summarize our environment ###########################  ######################## Summarize our environment ###########################
624    
625  # keep some of our install paths first in the list for the unit tests  # keep some of our install paths first in the list for the unit tests
# Line 598  else: Line 658  else:
658      print("          LAPACK:  DISABLED")      print("          LAPACK:  DISABLED")
659  d_list=[]  d_list=[]
660  e_list=[]  e_list=[]
661  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','silo','visit','pyvisi':  for i in 'debug','openmp','netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit':
662      if env[i]: e_list.append(i)      if env[i]: e_list.append(i)
663      else: d_list.append(i)      else: d_list.append(i)
664  for i in e_list:  for i in e_list:
665      print("%16s:  YES"%i)      print("%16s:  YES"%i)
666  for i in d_list:  for i in d_list:
667      print("%16s:  DISABLED"%i)      print("%16s:  DISABLED"%i)
668    if env['cppunit']:
669        print("         CppUnit:  FOUND")
670    else:
671        print("         CppUnit:  NOT FOUND")
672    if env['gmsh']=='m':
673        print("            gmsh:  FOUND, MPI-ENABLED")
674    elif env['gmsh']=='s':
675        print("            gmsh:  FOUND")
676    else:
677        print("            gmsh:  NOT FOUND")
678    print("      vsl_random:  %s"%env['vsl_random'])
679        
680  if ((fatalwarning != '') and (env['werror'])):  if ((fatalwarning != '') and (env['werror'])):
681      print("  Treating warnings as errors")      print("  Treating warnings as errors")
682  else:  else:
# Line 633  Export( Line 705  Export(
705    ]    ]
706  )  )
707    
708  env.SConscript(dirs = ['tools/CppUnitTest/src'], variant_dir='build/$PLATFORM/tools/CppUnitTest', duplicate=0)  env.SConscript(dirs = ['tools/escriptconvert'], variant_dir='$BUILD_DIR/$PLATFORM/tools/escriptconvert', duplicate=0)
709  env.SConscript(dirs = ['tools/escriptconvert'], variant_dir='build/$PLATFORM/tools/escriptconvert', duplicate=0)  env.SConscript(dirs = ['paso/src'], variant_dir='$BUILD_DIR/$PLATFORM/paso', duplicate=0)
710  env.SConscript(dirs = ['paso/src'], variant_dir='build/$PLATFORM/paso', duplicate=0)  env.SConscript(dirs = ['weipa/src'], variant_dir='$BUILD_DIR/$PLATFORM/weipa', duplicate=0)
711  env.SConscript(dirs = ['weipa/src'], variant_dir='build/$PLATFORM/weipa', duplicate=0)  env.SConscript(dirs = ['escript/src'], variant_dir='$BUILD_DIR/$PLATFORM/escript', duplicate=0)
712  env.SConscript(dirs = ['escript/src'], variant_dir='build/$PLATFORM/escript', duplicate=0)  env.SConscript(dirs = ['esysUtils/src'], variant_dir='$BUILD_DIR/$PLATFORM/esysUtils', duplicate=0)
713  env.SConscript(dirs = ['esysUtils/src'], variant_dir='build/$PLATFORM/esysUtils', duplicate=0)  env.SConscript(dirs = ['dudley/src'], variant_dir='$BUILD_DIR/$PLATFORM/dudley', duplicate=0)
714  env.SConscript(dirs = ['dudley/src'], variant_dir='build/$PLATFORM/dudley', duplicate=0)  env.SConscript(dirs = ['finley/src'], variant_dir='$BUILD_DIR/$PLATFORM/finley', duplicate=0)
715  env.SConscript(dirs = ['finley/src'], variant_dir='build/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['modellib/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/modellib', duplicate=0)
716  env.SConscript(dirs = ['modellib/py_src'], variant_dir='build/$PLATFORM/modellib', duplicate=0)  env.SConscript(dirs = ['doc'], variant_dir='$BUILD_DIR/$PLATFORM/doc', duplicate=0)
717  env.SConscript(dirs = ['doc'], variant_dir='build/$PLATFORM/doc', duplicate=0)  env.SConscript(dirs = ['pyvisi/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/pyvisi', duplicate=0)
718  env.SConscript(dirs = ['pyvisi/py_src'], variant_dir='build/$PLATFORM/pyvisi', duplicate=0)  env.SConscript(dirs = ['pycad/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/pycad', duplicate=0)
719  env.SConscript(dirs = ['pycad/py_src'], variant_dir='build/$PLATFORM/pycad', duplicate=0)  env.SConscript(dirs = ['pythonMPI/src'], variant_dir='$BUILD_DIR/$PLATFORM/pythonMPI', duplicate=0)
720  env.SConscript(dirs = ['pythonMPI/src'], variant_dir='build/$PLATFORM/pythonMPI', duplicate=0)  env.SConscript(dirs = ['paso/profiling'], variant_dir='$BUILD_DIR/$PLATFORM/paso/profiling', duplicate=0)
 env.SConscript(dirs = ['paso/profiling'], variant_dir='build/$PLATFORM/paso/profiling', duplicate=0)  
721    
722  ######################## Populate the buildvars file #########################  ######################## Populate the buildvars file #########################
723    
# Line 684  buildvars.write("mpi_inc_path=%s\n"%mpi_ Line 755  buildvars.write("mpi_inc_path=%s\n"%mpi_
755  buildvars.write("mpi_lib_path=%s\n"%mpi_lib_path)  buildvars.write("mpi_lib_path=%s\n"%mpi_lib_path)
756  buildvars.write("lapack=%s\n"%env['lapack'])  buildvars.write("lapack=%s\n"%env['lapack'])
757  buildvars.write("pyvisi=%d\n"%env['pyvisi'])  buildvars.write("pyvisi=%d\n"%env['pyvisi'])
758  for i in 'netcdf','parmetis','papi','mkl','umfpack','silo','visit':  buildvars.write("vsl_random=%d\n"%int(env['vsl_random']))
759    for i in 'netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit':
760      buildvars.write("%s=%d\n"%(i, int(env[i])))      buildvars.write("%s=%d\n"%(i, int(env[i])))
761      if env[i]:      if env[i]:
762          buildvars.write("%s_inc_path=%s\n"%(i, eval(i+'_inc_path')))          buildvars.write("%s_inc_path=%s\n"%(i, eval(i+'_inc_path')))
# Line 693  buildvars.close() Line 765  buildvars.close()
765    
766  ################### Targets to build and install libraries ###################  ################### Targets to build and install libraries ###################
767    
768  target_init = env.Command(env['pyinstall']+'/__init__.py', None, Touch('$TARGET'))  target_init = env.Command(os.path.join(env['pyinstall'],'__init__.py'), None, Touch('$TARGET'))
769  env.Alias('target_init', [target_init])  env.Alias('target_init', [target_init])
770    # delete buildvars upon cleanup
771    env.Clean('target_init', os.path.join(env['libinstall'], 'buildvars'))
772    
773  # The headers have to be installed prior to build in order to satisfy  # The headers have to be installed prior to build in order to satisfy
774  # #include <paso/Common.h>  # #include <paso/Common.h>
# Line 753  env.Default('install_all') Line 827  env.Default('install_all')
827    
828  ################## Targets to build and run the test suite ###################  ################## Targets to build and run the test suite ###################
829    
830  env.Alias('build_cppunittest', ['install_cppunittest_headers', 'build_cppunittest_lib'])  test_msg = env.Command('.dummy.', None, '@echo "Cannot run C/C++ unit tests, CppUnit not found!";exit 1')
831  env.Alias('install_cppunittest', ['build_cppunittest', 'install_cppunittest_lib'])  if not env['cppunit']:
832  env.Alias('run_tests', ['install_all', 'install_cppunittest_lib'])      env.Alias('run_tests', test_msg)
833  env.Alias('all_tests', ['install_all', 'install_cppunittest_lib', 'run_tests', 'py_tests'])  env.Alias('run_tests', ['install_all'])
834    env.Alias('all_tests', ['install_all', 'run_tests', 'py_tests'])
835  env.Alias('build_full',['install_all','build_tests','build_py_tests'])  env.Alias('build_full',['install_all','build_tests','build_py_tests'])
836  env.Alias('build_PasoTests','build/$PLATFORM/paso/profiling/PasoTests')  env.Alias('build_PasoTests','$BUILD_DIR/$PLATFORM/paso/profiling/PasoTests')
837    
838  ##################### Targets to build the documentation #####################  ##################### Targets to build the documentation #####################
839    
840  env.Alias('api_epydoc','install_all')  env.Alias('api_epydoc','install_all')
841  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'guide_html','install_pdf', 'cookbook_pdf'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'user_pdf', 'install_pdf', 'cookbook_pdf'])
842  env.Alias('release_prep', ['docs', 'install_all'])  env.Alias('release_prep', ['docs', 'install_all'])
843    
844  if not IS_WINDOWS:  if not IS_WINDOWS:
# Line 779  if not IS_WINDOWS: Line 854  if not IS_WINDOWS:
854          print("Error attempting to write unittests file.")          print("Error attempting to write unittests file.")
855          Exit(1)          Exit(1)
856    
857        # delete utest.sh upon cleanup
858        env.Clean('target_init', 'utest.sh')
859    
860      # Make sure that the escript wrapper is in place      # Make sure that the escript wrapper is in place
861      if not os.path.isfile(os.path.join(env['bininstall'], 'run-escript')):      if not os.path.isfile(os.path.join(env['bininstall'], 'run-escript')):
862          print("Copying escript wrapper.")          print("Copying escript wrapper.")
863          Execute(Copy(os.path.join(env['bininstall'],'escript'), 'bin/run-escript'))          Execute(Copy(os.path.join(env['bininstall'],'run-escript'), 'bin/run-escript'))
864    

Legend:
Removed from v.3271  
changed lines
  Added in v.3604

  ViewVC Help
Powered by ViewVC 1.1.26