/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 5017 by sshaw, Tue Jun 10 02:16:18 2014 UTC revision 5123 by sshaw, Thu Aug 28 07:02:11 2014 UTC
# Line 153  env = Environment(tools = ['default'], o Line 153  env = Environment(tools = ['default'], o
153  def mkclang(env):  def mkclang(env):
154      env['CXX']='clang++'      env['CXX']='clang++'
155    
156  if env['tools_names'] != 'default':  if env['tools_names'] != ['default']:
157      zz=env['tools_names']      zz=env['tools_names']
158      if 'clang' in zz:      if 'clang' in zz:
159          zz.remove('clang')          zz.remove('clang')
# Line 370  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N Line 370  for key in 'OMP_NUM_THREADS', 'ESCRIPT_N
370      try:      try:
371          env['ENV'][key] = os.environ[key]          env['ENV'][key] = os.environ[key]
372      except KeyError:      except KeyError:
373          env['ENV'][key] = 1          env['ENV'][key] = '1'
374    
375  env_export=env['env_export']  env_export=env['env_export']
376  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME','KMP_MONITOR_STACKSIZE','TMPDIR','TEMP','TMP','LD_PRELOAD'])  env_export.extend(['ESCRIPT_NUM_THREADS','ESCRIPT_HOSTFILE','DISPLAY','XAUTHORITY','PATH','HOME','KMP_MONITOR_STACKSIZE','TMPDIR','TEMP','TMP','LD_PRELOAD'])
# Line 507  env.SConscript(dirs = ['pasowrap/src'], Line 507  env.SConscript(dirs = ['pasowrap/src'],
507  env.SConscript(dirs = ['dudley/src'], variant_dir='$BUILD_DIR/$PLATFORM/dudley', duplicate=0)  env.SConscript(dirs = ['dudley/src'], variant_dir='$BUILD_DIR/$PLATFORM/dudley', duplicate=0)
508  env.SConscript(dirs = ['finley/src'], variant_dir='$BUILD_DIR/$PLATFORM/finley', duplicate=0)  env.SConscript(dirs = ['finley/src'], variant_dir='$BUILD_DIR/$PLATFORM/finley', duplicate=0)
509  env.SConscript(dirs = ['ripley/src'], variant_dir='$BUILD_DIR/$PLATFORM/ripley', duplicate=0)  env.SConscript(dirs = ['ripley/src'], variant_dir='$BUILD_DIR/$PLATFORM/ripley', duplicate=0)
510    env.SConscript(dirs = ['speckley/src'], variant_dir='$BUILD_DIR/$PLATFORM/speckley', duplicate=0)
511  env.SConscript(dirs = ['downunder/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/downunder', duplicate=0)  env.SConscript(dirs = ['downunder/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/downunder', duplicate=0)
512  env.SConscript(dirs = ['modellib/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/modellib', duplicate=0)  env.SConscript(dirs = ['modellib/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/modellib', duplicate=0)
513  env.SConscript(dirs = ['pycad/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/pycad', duplicate=0)  env.SConscript(dirs = ['pycad/py_src'], variant_dir='$BUILD_DIR/$PLATFORM/pycad', duplicate=0)
# Line 549  env.Alias('install_finley', ['build_finl Line 550  env.Alias('install_finley', ['build_finl
550  env.Alias('build_ripley', ['install_ripley_headers', 'build_ripley_lib', 'build_ripleycpp_lib'])  env.Alias('build_ripley', ['install_ripley_headers', 'build_ripley_lib', 'build_ripleycpp_lib'])
551  env.Alias('install_ripley', ['build_ripley', 'install_ripley_lib', 'install_ripleycpp_lib', 'install_ripley_py'])  env.Alias('install_ripley', ['build_ripley', 'install_ripley_lib', 'install_ripleycpp_lib', 'install_ripley_py'])
552    
553    env.Alias('build_speckley', ['install_speckley_headers', 'build_speckley_lib', 'build_speckleycpp_lib'])
554    env.Alias('install_speckley', ['build_speckley', 'install_speckley_lib', 'install_speckleycpp_lib', 'install_speckley_py'])
555    
556  env.Alias('build_weipa', ['install_weipa_headers', 'build_weipa_lib', 'build_weipacpp_lib'])  env.Alias('build_weipa', ['install_weipa_headers', 'build_weipa_lib', 'build_weipacpp_lib'])
557  env.Alias('install_weipa', ['build_weipa', 'install_weipa_lib', 'install_weipacpp_lib', 'install_weipa_py'])  env.Alias('install_weipa', ['build_weipa', 'install_weipa_lib', 'install_weipacpp_lib', 'install_weipa_py'])
558    
# Line 564  build_all_list += ['build_pasowrap'] Line 568  build_all_list += ['build_pasowrap']
568  build_all_list += ['build_dudley']  build_all_list += ['build_dudley']
569  build_all_list += ['build_finley']  build_all_list += ['build_finley']
570  build_all_list += ['build_ripley']  build_all_list += ['build_ripley']
571    build_all_list += ['build_speckley']
572  build_all_list += ['build_weipa']  build_all_list += ['build_weipa']
573  if not IS_WINDOWS: build_all_list += ['build_escriptreader']  if not IS_WINDOWS: build_all_list += ['build_escriptreader']
574  if env['usempi']:   build_all_list += ['build_pythonMPI']  if env['usempi']:   build_all_list += ['build_pythonMPI']
# Line 579  install_all_list += ['install_pasowrap'] Line 584  install_all_list += ['install_pasowrap']
584  install_all_list += ['install_dudley']  install_all_list += ['install_dudley']
585  install_all_list += ['install_finley']  install_all_list += ['install_finley']
586  install_all_list += ['install_ripley']  install_all_list += ['install_ripley']
587    install_all_list += ['install_speckley']
588  install_all_list += ['install_weipa']  install_all_list += ['install_weipa']
589  if not IS_WINDOWS: install_all_list += ['install_escriptreader']  if not IS_WINDOWS: install_all_list += ['install_escriptreader']
590  install_all_list += ['install_downunder_py']  install_all_list += ['install_downunder_py']

Legend:
Removed from v.5017  
changed lines
  Added in v.5123

  ViewVC Help
Powered by ViewVC 1.1.26