/[escript]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 5814 by jfenwick, Fri Oct 2 04:52:56 2015 UTC revision 5851 by jfenwick, Thu Dec 10 05:09:35 2015 UTC
# Line 150  vars.AddVariables( Line 150  vars.AddVariables(
150    BoolVariable('papi', 'Enable PAPI', False),    BoolVariable('papi', 'Enable PAPI', False),
151    ('papi_prefix', 'Prefix/Paths to PAPI installation', default_prefix),    ('papi_prefix', 'Prefix/Paths to PAPI installation', default_prefix),
152    ('papi_libs', 'PAPI libraries to link with', ['papi']),    ('papi_libs', 'PAPI libraries to link with', ['papi']),
153    BoolVariable('papi_instrument_solver', 'Use PAPI to instrument each iteration of the solver', False)    BoolVariable('papi_instrument_solver', 'Use PAPI to instrument each iteration of the solver', False),
154      BoolVariable('osx_dependency_fix', 'Fix dependencies for libraries to have absolute paths (OSX)',
155    False)
156  )  )
157    
158  ##################### Create environment and help text #######################  ##################### Create environment and help text #######################
# Line 685  if env['usempi']: Line 687  if env['usempi']:
687      install_all_list += ['install_pythonMPI', 'install_overlord']      install_all_list += ['install_pythonMPI', 'install_overlord']
688  install_all_list += ['install_weipa_py']      install_all_list += ['install_weipa_py']    
689  install_all_list += [env.Install(os.path.join(env['build_dir'],'scripts'), os.path.join('scripts', 'release_sanity.py'))]  install_all_list += [env.Install(os.path.join(env['build_dir'],'scripts'), os.path.join('scripts', 'release_sanity.py'))]
690  install_all=env.Alias('install_all', install_all_list)  
691    
692    if env['osx_dependency_fix']:
693        print("Require dependency fix")
694        install_all=env.Command('install_all',install_all_list,'scripts/moveall.sh')
695    else:
696        print("Not here")
697        install_all=env.Alias('install_all', install_all_list)
698    
699    
700    
701    
702  # Default target is install  # Default target is install
703  #env.Default('install_all')  #env.Default('install_all')
# Line 708  if 'install_dudley' in install_all_list Line 720  if 'install_dudley' in install_all_list
720  else:  else:
721      env.Default('install_all')      env.Default('install_all')
722    
723    
724    print("Here")
725    
726    
727    
728  ################## Targets to build and run the test suite ###################  ################## Targets to build and run the test suite ###################
729    
730  if not env['cppunit']:  if not env['cppunit']:

Legend:
Removed from v.5814  
changed lines
  Added in v.5851

  ViewVC Help
Powered by ViewVC 1.1.26