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

Diff of /branches/py3_attempt2/SConstruct

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

revision 3304 by caltinay, Mon Oct 25 04:43:48 2010 UTC revision 3338 by jfenwick, Fri Nov 5 03:50:51 2010 UTC
# Line 71  vars.AddVariables( Line 71  vars.AddVariables(
71    ('omp_ldflags', 'OpenMP linker flags', 'default'),    ('omp_ldflags', 'OpenMP linker flags', 'default'),
72  # Mandatory libraries  # Mandatory libraries
73    ('boost_prefix', 'Prefix/Paths of boost installation', default_prefix),    ('boost_prefix', 'Prefix/Paths of boost installation', default_prefix),
74    ('boost_libs', 'Boost libraries to link with', ['boost_python']),    ('boost_libs', 'Boost libraries to link with', ['boost_python-mt']),
75  # Optional libraries and options  # Optional libraries and options
76    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),
77    ('mpi_prefix', 'Prefix/Paths of MPI installation', default_prefix),    ('mpi_prefix', 'Prefix/Paths of MPI installation', default_prefix),
# Line 125  vars.AddVariables( Line 125  vars.AddVariables(
125  # Intel's compiler uses regular expressions improperly and emits a warning  # Intel's compiler uses regular expressions improperly and emits a warning
126  # about failing to find the compilers. This warning can be safely ignored.  # about failing to find the compilers. This warning can be safely ignored.
127    
128  env = Environment(tools = ['default'], options = vars)  # PATH is needed so the compiler, linker and tools are found if they are not
129    # in default locations.
130    env = Environment(tools = ['default'], options = vars,
131                      ENV = {'PATH': os.environ['PATH']})
132  if env['tools_names'] != 'default':  if env['tools_names'] != 'default':
133      env = Environment(tools = ['default'] + env['tools_names'], options = vars)      env = Environment(tools = ['default'] + env['tools_names'], options = vars,
134                          ENV = {'PATH' : os.environ['PATH']})
135    
136  if options_file:  if options_file:
137      opts_valid=False      opts_valid=False
# Line 297  if IS_WINDOWS: Line 301  if IS_WINDOWS:
301  else:  else:
302      LD_LIBRARY_PATH_KEY='LD_LIBRARY_PATH'      LD_LIBRARY_PATH_KEY='LD_LIBRARY_PATH'
303    
304  # 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.  
305    
306  for key in 'OMP_NUM_THREADS', 'ESCRIPT_NUM_PROCS', 'ESCRIPT_NUM_NODES':  for key in 'OMP_NUM_THREADS', 'ESCRIPT_NUM_PROCS', 'ESCRIPT_NUM_NODES':
307      try:      try:
# Line 782  if not IS_WINDOWS: Line 785  if not IS_WINDOWS:
785      # Make sure that the escript wrapper is in place      # Make sure that the escript wrapper is in place
786      if not os.path.isfile(os.path.join(env['bininstall'], 'run-escript')):      if not os.path.isfile(os.path.join(env['bininstall'], 'run-escript')):
787          print("Copying escript wrapper.")          print("Copying escript wrapper.")
788          Execute(Copy(os.path.join(env['bininstall'],'escript'), 'bin/run-escript'))          Execute(Copy(os.path.join(env['bininstall'],'run-escript'), 'bin/run-escript'))
789    

Legend:
Removed from v.3304  
changed lines
  Added in v.3338

  ViewVC Help
Powered by ViewVC 1.1.26