zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some environment methods to be less repetitive, add set_path.

Browse Source
This commit is contained in:
Todd Gamblin
2016-03-21 02:21:31 -07:00
parent 439d47b4e4
commit b1516f64eb
8 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/mpich/package.py
View File

@@ -48,11 +48,11 @@ class Mpich(Package):
provides('mpi@:1.3', when='@1:')
def setup_dependent_environment(self, env, dependent_spec):
env.set_env('MPICH_CC', spack_cc)
env.set_env('MPICH_CXX', spack_cxx)
env.set_env('MPICH_F77', spack_f77)
env.set_env('MPICH_F90', spack_f90)
env.set_env('MPICH_FC', spack_fc)
env.set('MPICH_CC', spack_cc)
env.set('MPICH_CXX', spack_cxx)
env.set('MPICH_F77', spack_f77)
env.set('MPICH_F90', spack_f90)
env.set('MPICH_FC', spack_fc)
def setup_dependent_python_module(self, module, spec, dep_spec):
"""For dependencies, make mpicc's use spack wrapper."""

8
var/spack/repos/builtin/packages/openmpi/package.py
View File

@@ -43,10 +43,10 @@ def url_for_version(self, version):
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
spack_env.set_env('OMPI_CC', spack_cc)
spack_env.set_env('OMPI_CXX', spack_cxx)
spack_env.set_env('OMPI_FC', spack_fc)
spack_env.set_env('OMPI_F77', spack_f77)
spack_env.set('OMPI_CC', spack_cc)
spack_env.set('OMPI_CXX', spack_cxx)
spack_env.set('OMPI_FC', spack_fc)
spack_env.set('OMPI_F77', spack_f77)
def install(self, spec, prefix):

4
var/spack/repos/builtin/packages/python/package.py
View File

@@ -104,8 +104,8 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
python_paths.append(os.path.join(d.prefix, self.site_packages_dir))
pythonpath = ':'.join(python_paths)
spack_env.set_env('PYTHONPATH', pythonpath)
run_env.set_env('PYTHONPATH', pythonpath)
spack_env.set('PYTHONPATH', pythonpath)
run_env.set('PYTHONPATH', pythonpath)
def modify_module(self, module, spec, ext_spec):

4
var/spack/repos/builtin/packages/qt/package.py
View File

@@ -57,11 +57,11 @@ class Qt(Package):
def setup_environment(self, spack_env, env):
env.set_env('QTDIR', self.prefix)
env.set('QTDIR', self.prefix)
def setup_dependent_environment(self, spack_env, run_env, dspec):
spack_env.set_env('QTDIR', self.prefix)
spack_env.set('QTDIR', self.prefix)
def patch(self):

5
var/spack/repos/builtin/packages/ruby/package.py
View File

@@ -25,9 +25,10 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
if d.package.extends(self.spec):
ruby_paths.append(d.prefix)
spack_env.set_env('GEM_PATH', concatenate_paths(ruby_paths))
spack_env.set_path('GEM_PATH', ruby_paths)
# The actual installation path for this gem
spack_env.set_env('GEM_HOME', extension_spec.prefix)
spack_env.set('GEM_HOME', extension_spec.prefix)
def modify_module(self, module, spec, ext_spec):
"""Called before ruby modules' install() methods. Sets GEM_HOME