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

Diff of /branches/refine/SConstruct

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

trunk/SConstruct revision 3332 by jfenwick, Mon Nov 1 05:26:55 2010 UTC branches/refine/SConstruct revision 3632 by jfenwick, Thu Oct 20 04:27:45 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 47  if not os.path.isfile(options_file): Line 47  if not os.path.isfile(options_file):
47  ############################### Build options ################################  ############################### Build options ################################
48    
49  default_prefix='/usr'  default_prefix='/usr'
50  mpi_flavours=('none', 'MPT', 'MPICH', 'MPICH2', 'OPENMPI', 'INTELMPI')  mpi_flavours=('no', 'none', 'MPT', 'MPICH', 'MPICH2', 'OPENMPI', 'INTELMPI')
51  lapack_flavours=('none', 'clapack', 'mkl')  lapack_flavours=('none', 'clapack', 'mkl')
52    
53  vars = Variables(options_file, ARGUMENTS)  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      ('SVN_VERSION', 'Do not use from options file', -2),
129  )  )
130    
131  ##################### Create environment and help text #######################  ##################### Create environment and help text #######################
# Line 157  if len(vars.UnknownVariables())>0: Line 165  if len(vars.UnknownVariables())>0:
165    
166  #################### Make sure install directories exist #####################  #################### Make sure install directories exist #####################
167    
168    env['BUILD_DIR']=env['build_dir']
169  prefix=Dir(env['prefix']).abspath  prefix=Dir(env['prefix']).abspath
170  env['incinstall'] = os.path.join(prefix, 'include')  env['incinstall'] = os.path.join(prefix, 'include')
171  env['bininstall'] = os.path.join(prefix, 'bin')  env['bininstall'] = os.path.join(prefix, 'bin')
# Line 275  env.Append(CCFLAGS = env['cc_flags']) Line 284  env.Append(CCFLAGS = env['cc_flags'])
284  # add system libraries  # add system libraries
285  env.AppendUnique(LIBS = env['sys_libs'])  env.AppendUnique(LIBS = env['sys_libs'])
286    
287  # Get the global Subversion revision number for the getVersion() method  
288  try:  global_revision=ARGUMENTS.get('SVN_VERSION', None)
289    if global_revision:
290        global_revision = re.sub(':.*', '', global_revision)
291        global_revision = re.sub('[^0-9]', '', global_revision)
292        if global_revision == '': global_revision='-2'
293    else:
294      # Get the global Subversion revision number for the getVersion() method
295      try:
296      global_revision = os.popen('svnversion -n .').read()      global_revision = os.popen('svnversion -n .').read()
297      global_revision = re.sub(':.*', '', global_revision)      global_revision = re.sub(':.*', '', global_revision)
298      global_revision = re.sub('[^0-9]', '', global_revision)      global_revision = re.sub('[^0-9]', '', global_revision)
299      if global_revision == '': global_revision='-2'      if global_revision == '': global_revision='-2'
300  except:    except:
301      global_revision = '-1'      global_revision = '-1'
302  env['svn_revision']=global_revision  env['svn_revision']=global_revision
303  env.Append(CPPDEFINES=['SVN_VERSION='+global_revision])  env.Append(CPPDEFINES=['SVN_VERSION='+global_revision])
304    
305  if IS_WINDOWS:  if IS_WINDOWS:
306      if not env['share_esysutils']:      if not env['build_shared']:
307          env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])          env.Append(CPPDEFINES = ['ESYSUTILS_STATIC_LIB'])
     if not env['share_paso']:  
308          env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])          env.Append(CPPDEFINES = ['PASO_STATIC_LIB'])
309    
310  ###################### Copy required environment vars ########################  ###################### Copy required environment vars ########################
# Line 310  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N Line 325  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N
325          env['ENV'][key] = 1          env['ENV'][key] = 1
326    
327  env_export=env['env_export']  env_export=env['env_export']
328  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'])
329    
330  for key in set(env_export):  for key in set(env_export):
331      try:      try:
# Line 379  if conf.CheckFunc('gethostname'): Line 394  if conf.CheckFunc('gethostname'):
394  python_inc_path=sysconfig.get_python_inc()  python_inc_path=sysconfig.get_python_inc()
395  if IS_WINDOWS:  if IS_WINDOWS:
396      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')      python_lib_path=os.path.join(sysconfig.get_config_var('prefix'), 'libs')
397    elif env['PLATFORM']=='darwin':
398        python_lib_path=sysconfig.get_config_var('LIBPL')
399  else:  else:
400      python_lib_path=sysconfig.get_config_var('LIBDIR')      python_lib_path=sysconfig.get_config_var('LIBDIR')
401  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux  #python_libs=[sysconfig.get_config_var('LDLIBRARY')] # only on linux
# Line 432  except ImportError: Line 449  except ImportError:
449      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)
450      Exit(1)      Exit(1)
451    
452    ######## CppUnit (required for tests)
453    
454    try:
455        cppunit_inc_path,cppunit_lib_path=findLibWithHeader(env, env['cppunit_libs'], 'cppunit/TestFixture.h', env['cppunit_prefix'], lang='c++')
456        env.AppendUnique(CPPPATH = [cppunit_inc_path])
457        env.AppendUnique(LIBPATH = [cppunit_lib_path])
458        env.PrependENVPath(LD_LIBRARY_PATH_KEY, cppunit_lib_path)
459        env['cppunit']=True
460    except:
461        env['cppunit']=False
462    
463  ######## VTK (optional)  ######## VTK (optional)
464    
465  if env['pyvisi']:  if env['pyvisi']:
# Line 522  if env['silo']: Line 550  if env['silo']:
550      # weipa library and tools.      # weipa library and tools.
551      #env.AppendUnique(LIBS = [env['silo_libs']])      #env.AppendUnique(LIBS = [env['silo_libs']])
552    
553    ######## VSL random numbers (optional)
554    if env['vsl_random']:
555        env.Append(CPPDEFINES = ['MKLRANDOM'])
556    
557  ######## VisIt (optional)  ######## VisIt (optional)
558    
559  visit_inc_path=''  visit_inc_path=''
# Line 533  if env['visit']: Line 565  if env['visit']:
565    
566  ######## MPI (optional)  ######## MPI (optional)
567    
568    if env['mpi']=='no':
569        env['mpi']='none'
570    
571  env['usempi'] = env['mpi']!='none'  env['usempi'] = env['mpi']!='none'
572  mpi_inc_path=''  mpi_inc_path=''
573  mpi_lib_path=''  mpi_lib_path=''
# Line 549  if env['usempi']: Line 584  if env['usempi']:
584      if env['netcdf'] and env['mpi'] in ['MPT','OPENMPI']:      if env['netcdf'] and env['mpi'] in ['MPT','OPENMPI']:
585          env.Append(CPPDEFINES = ['MPI_INCLUDED'])          env.Append(CPPDEFINES = ['MPI_INCLUDED'])
586    
587    ######## BOOMERAMG (optional)
588    
589    if env['mpi'] == 'none': env['boomeramg'] = False
590    
591    boomeramg_inc_path=''
592    boomeramg_lib_path=''
593    if env['boomeramg']:
594        boomeramg_inc_path,boomeramg_lib_path=findLibWithHeader(env, env['boomeramg_libs'], 'HYPRE.h', env['boomeramg_prefix'], lang='c')
595        env.AppendUnique(CPPPATH = [boomeramg_inc_path])
596        env.AppendUnique(LIBPATH = [boomeramg_lib_path])
597        env.AppendUnique(LIBS = env['boomeramg_libs'])
598        env.PrependENVPath(LD_LIBRARY_PATH_KEY, boomeramg_lib_path)
599        env.Append(CPPDEFINES = ['BOOMERAMG'])
600    
601  ######## ParMETIS (optional)  ######## ParMETIS (optional)
602    
603  if not env['usempi']: env['parmetis'] = False  if not env['usempi']: env['parmetis'] = False
# Line 563  if env['parmetis']: Line 612  if env['parmetis']:
612      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)      env.PrependENVPath(LD_LIBRARY_PATH_KEY, parmetis_lib_path)
613      env.Append(CPPDEFINES = ['USE_PARMETIS'])      env.Append(CPPDEFINES = ['USE_PARMETIS'])
614    
615    ######## gmsh (optional, for tests)
616    
617    try:
618        import subprocess
619        p=subprocess.Popen(['gmsh', '-info'], stderr=subprocess.PIPE)
620        _,e=p.communicate()
621        if e.split().count("MPI"):
622            env['gmsh']='m'
623        else:
624            env['gmsh']='s'
625    except OSError:
626        env['gmsh']=False
627    
628    ######## PDFLaTeX (for documentation)
629    if 'PDF' in dir(env) and '.tex' in env.PDF.builder.src_suffixes(env):
630        env['pdflatex']=True
631    else:
632        env['pdflatex']=False
633    
634  ######################## Summarize our environment ###########################  ######################## Summarize our environment ###########################
635    
636  # 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 601  else: Line 669  else:
669      print("          LAPACK:  DISABLED")      print("          LAPACK:  DISABLED")
670  d_list=[]  d_list=[]
671  e_list=[]  e_list=[]
672  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':
673      if env[i]: e_list.append(i)      if env[i]: e_list.append(i)
674      else: d_list.append(i)      else: d_list.append(i)
675  for i in e_list:  for i in e_list:
676      print("%16s:  YES"%i)      print("%16s:  YES"%i)
677  for i in d_list:  for i in d_list:
678      print("%16s:  DISABLED"%i)      print("%16s:  DISABLED"%i)
679    if env['cppunit']:
680        print("         CppUnit:  FOUND")
681    else:
682        print("         CppUnit:  NOT FOUND")
683    if env['gmsh']=='m':
684        print("            gmsh:  FOUND, MPI-ENABLED")
685    elif env['gmsh']=='s':
686        print("            gmsh:  FOUND")
687    else:
688        print("            gmsh:  NOT FOUND")
689    print("      vsl_random:  %s"%env['vsl_random'])
690        
691  if ((fatalwarning != '') and (env['werror'])):  if ((fatalwarning != '') and (env['werror'])):
692      print("  Treating warnings as errors")      print("  Treating warnings as errors")
693  else:  else:
# Line 636  Export( Line 716  Export(
716    ]    ]
717  )  )
718    
719  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)
720  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)
721  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)
722  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)
723  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)
724  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)
725  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)
726  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)
727  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)
728  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)
729  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)
730  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)
731  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)  
732    
733  ######################## Populate the buildvars file #########################  ######################## Populate the buildvars file #########################
734    
# Line 687  buildvars.write("mpi_inc_path=%s\n"%mpi_ Line 766  buildvars.write("mpi_inc_path=%s\n"%mpi_
766  buildvars.write("mpi_lib_path=%s\n"%mpi_lib_path)  buildvars.write("mpi_lib_path=%s\n"%mpi_lib_path)
767  buildvars.write("lapack=%s\n"%env['lapack'])  buildvars.write("lapack=%s\n"%env['lapack'])
768  buildvars.write("pyvisi=%d\n"%env['pyvisi'])  buildvars.write("pyvisi=%d\n"%env['pyvisi'])
769  for i in 'netcdf','parmetis','papi','mkl','umfpack','silo','visit':  buildvars.write("vsl_random=%d\n"%int(env['vsl_random']))
770    for i in 'netcdf','parmetis','papi','mkl','umfpack','boomeramg','silo','visit':
771      buildvars.write("%s=%d\n"%(i, int(env[i])))      buildvars.write("%s=%d\n"%(i, int(env[i])))
772      if env[i]:      if env[i]:
773          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 696  buildvars.close() Line 776  buildvars.close()
776    
777  ################### Targets to build and install libraries ###################  ################### Targets to build and install libraries ###################
778    
779  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'))
780  env.Alias('target_init', [target_init])  env.Alias('target_init', [target_init])
781    # delete buildvars upon cleanup
782    env.Clean('target_init', os.path.join(env['libinstall'], 'buildvars'))
783    
784  # 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
785  # #include <paso/Common.h>  # #include <paso/Common.h>
# Line 756  env.Default('install_all') Line 838  env.Default('install_all')
838    
839  ################## Targets to build and run the test suite ###################  ################## Targets to build and run the test suite ###################
840    
841  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')
842  env.Alias('install_cppunittest', ['build_cppunittest', 'install_cppunittest_lib'])  if not env['cppunit']:
843  env.Alias('run_tests', ['install_all', 'install_cppunittest_lib'])      env.Alias('run_tests', test_msg)
844  env.Alias('all_tests', ['install_all', 'install_cppunittest_lib', 'run_tests', 'py_tests'])  env.Alias('run_tests', ['install_all'])
845    env.Alias('all_tests', ['install_all', 'run_tests', 'py_tests'])
846  env.Alias('build_full',['install_all','build_tests','build_py_tests'])  env.Alias('build_full',['install_all','build_tests','build_py_tests'])
847  env.Alias('build_PasoTests','build/$PLATFORM/paso/profiling/PasoTests')  env.Alias('build_PasoTests','$BUILD_DIR/$PLATFORM/paso/profiling/PasoTests')
848    
849  ##################### Targets to build the documentation #####################  ##################### Targets to build the documentation #####################
850    
851  env.Alias('api_epydoc','install_all')  env.Alias('api_epydoc','install_all')
852  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'guide_pdf', 'install_pdf', 'cookbook_pdf'])  env.Alias('docs', ['examples_tarfile', 'examples_zipfile', 'api_epydoc', 'api_doxygen', 'user_pdf', 'install_pdf', 'cookbook_pdf'])
853  env.Alias('release_prep', ['docs', 'install_all'])  env.Alias('release_prep', ['docs', 'install_all'])
854    
855  if not IS_WINDOWS:  if not IS_WINDOWS:
# Line 782  if not IS_WINDOWS: Line 865  if not IS_WINDOWS:
865          print("Error attempting to write unittests file.")          print("Error attempting to write unittests file.")
866          Exit(1)          Exit(1)
867    
868        # delete utest.sh upon cleanup
869        env.Clean('target_init', 'utest.sh')
870    
871      # Make sure that the escript wrapper is in place      # Make sure that the escript wrapper is in place
872      if not os.path.isfile(os.path.join(env['bininstall'], 'run-escript')):      if not os.path.isfile(os.path.join(env['bininstall'], 'run-escript')):
873          print("Copying escript wrapper.")          print("Copying escript wrapper.")

Legend:
Removed from v.3332  
changed lines
  Added in v.3632

  ViewVC Help
Powered by ViewVC 1.1.26