package : renamed `setup_dependent_environment` to `module_modifications`

8 files changed, 22 insertions, 28 deletions

diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index d321a0e495..e86a7c413a 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -284,8 +284,8 @@ def setup_package(pkg):
 
     # Allow dependencies to set up environment as well.
     for dep_spec in pkg.spec.traverse(root=False):
-        env.extend(dep_spec.package.environment_modifications(pkg.module, dep_spec, pkg.spec))
-        dep_spec.package.setup_dependent_environment(pkg.module, dep_spec, pkg.spec)
+        dep_spec.package.module_modifications(pkg.module, dep_spec, pkg.spec)
+        env.extend(dep_spec.package.environment_modifications(pkg.spec))
     apply_environment_modifications(env)
 
 
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 224d7f8f4b..c1a5c912be 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -984,10 +984,10 @@ class Package(object):
                           fromlist=[self.__class__.__name__])
 
 
-    def environment_modifications(self, module, spec, dependent_spec):
+    def environment_modifications(self, dependent_spec):
         return EnvironmentModifications()
 
-    def setup_dependent_environment(self, module, spec, dependent_spec):
+    def module_modifications(self, module, spec, dependent_spec):
         """Called before the install() method of dependents.
 
         Default implementation does nothing, but this can be
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index c85e8febf3..d298981c92 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -46,8 +46,8 @@ class Mpich(Package):
     provides('mpi@:3.0', when='@3:')
     provides('mpi@:1.3', when='@1:')
 
-    def environment_modifications(self, module, spec, dependent_spec):
-        env = super(Mpich, self).environment_modifications(module, spec, dependent_spec)
+    def environment_modifications(self, dependent_spec):
+        env = super(Mpich, self).environment_modifications(dependent_spec)
         env.set_env('MPICH_CC', os.environ['CC'])
         env.set_env('MPICH_CXX', os.environ['CXX'])
         env.set_env('MPICH_F77', os.environ['F77'])
@@ -55,7 +55,7 @@ class Mpich(Package):
         env.set_env('MPICH_FC', os.environ['FC'])
         return env
 
-    def setup_dependent_environment(self, module, spec, dep_spec):
+    def module_modifications(self, module, spec, dep_spec):
         """For dependencies, make mpicc's use spack wrapper."""
         # FIXME : is this necessary ? Shouldn't this be part of a contract with MPI providers?
         module.mpicc = join_path(self.prefix.bin, 'mpicc')
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
index 6dbf367475..ecdea46442 100644
--- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py
+++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py
@@ -40,7 +40,7 @@ class NetlibScalapack(Package):
             make()
             make("install")
 
-    def setup_dependent_environment(self, module, spec, dependent_spec):
+    def module_modifications(self, module, spec, dependent_spec):
         # TODO treat OS that are not Linux...
         lib_suffix = '.so' if '+shared' in spec['scalapack'] else '.a'
 
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 83a3fe7a4f..3a14170457 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -41,8 +41,8 @@ class Openmpi(Package):
     def url_for_version(self, version):
         return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (version.up_to(2), version)
 
-    def environment_modifications(self, module, spec, dependent_spec):
-        env = super(Openmpi, self).environment_modifications(module, spec, dependent_spec)
+    def environment_modifications(self, dependent_spec):
+        env = super(Openmpi, self).environment_modifications(dependent_spec)
         # FIXME : the compilers should point to the current wrappers, not to generic cc etc.
         env.set_env('OMPI_CC', 'cc')
         env.set_env('OMPI_CXX', 'c++')
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py
index 39ced0a120..307cec726b 100644
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -89,19 +89,17 @@ class Python(Package):
     def site_packages_dir(self):
         return os.path.join(self.python_lib_dir, 'site-packages')
 
-
-    def environment_modifications(self, module, spec, dependent_spec):
-        env = super(Python, self).environment_modifications(module, spec, dependent_spec)
+    def environment_modifications(self, extension_spec):
+        env = super(Python, self).environment_modifications(extension_spec)
         # Set PYTHONPATH to include site-packages dir for the
         # extension and any other python extensions it depends on.
         python_paths = []
-        for d in ext_spec.traverse():
+        for d in extension_spec.traverse():
             if d.package.extends(self.spec):
                 python_paths.append(os.path.join(d.prefix, self.site_packages_dir))
         env.set_env['PYTHONPATH'] = ':'.join(python_paths)
 
-
-    def setup_dependent_environment(self, module, spec, ext_spec):
+    def module_modifications(self, module, spec, ext_spec):
         """Called before python modules' install() methods.
 
         In most cases, extensions will only need to have one line::
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 373623cd95..8391ded3e0 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -52,11 +52,8 @@ class Qt(Package):
     depends_on("mesa", when='@4:+mesa')
     depends_on("libxcb")
 
-    def environment_modifications(self, module, spec, dep_spec):
-        """
-        Dependencies of Qt find it using the QTDIR environment variable
-        """
-        env = super(Qt, self).environment_modifications(module, spec, dep_spec)
+    def environment_modifications(self, dependent_spec):
+        env = super(Qt, self).environment_modifications(dependent_spec)
         env.set_env['QTDIR'] = self.prefix
         return env
 
diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py
index 9ec0afa268..9caea30ef4 100644
--- a/var/spack/repos/builtin/packages/ruby/package.py
+++ b/var/spack/repos/builtin/packages/ruby/package.py
@@ -1,6 +1,5 @@
 from spack import *
-import spack
-import os
+
 
 class Ruby(Package):
     """A dynamic, open source programming language with a focus on 
@@ -18,19 +17,19 @@ class Ruby(Package):
         make()
         make("install")
 
-    def environment_modifications(self, module, spec, ext_spec):
-        env = super(Ruby, self).environment_modifications(module, spec, ext_spec)
+    def environment_modifications(self, extension_spec):
+        env = super(Ruby, self).environment_modifications(extension_spec)
         # Set GEM_PATH to include dependent gem directories
         ruby_paths = []
-        for d in ext_spec.traverse():
+        for d in extension_spec.traverse():
             if d.package.extends(self.spec):
                 ruby_paths.append(d.prefix)
         env.set_env('GEM_PATH', concatenate_paths(ruby_paths))
         # The actual installation path for this gem
-        env.set_env('GEM_HOME', ext_spec.prefix)
+        env.set_env('GEM_HOME', extension_spec.prefix)
         return env
 
-    def setup_dependent_environment(self, module, spec, ext_spec):
+    def module_modifications(self, module, spec, ext_spec):
         """Called before ruby modules' install() methods.  Sets GEM_HOME
         and GEM_PATH to values appropriate for the package being built.