hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set JAVA_HOME on module load and on dependent installs. (#1716)

Browse source 
* Set JAVA_HOME on module load and on dependent installs.

* Include environment setup from dependencies in dependee module (#1714)
This commit is contained in:
Alfredo Adolfo Gimenez 2016-09-21 00:52:09 -07:00 committed by Todd Gamblin
parent 1cc48bf7d7
commit 02307cf7ce
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/spack/spack/modules.py
View file

@ -392,6 +392,7 @@ def write(self, overwrite=False):
for mod in modules: for mod in modules:
set_module_variables_for_package(package, mod) set_module_variables_for_package(package, mod)
set_module_variables_for_package(package, package.module) set_module_variables_for_package(package, package.module)
package.setup_environment(spack_env, env)
package.setup_dependent_package(self.pkg.module, self.spec) package.setup_dependent_package(self.pkg.module, self.spec)
package.setup_dependent_environment(spack_env, env, self.spec) package.setup_dependent_environment(spack_env, env, self.spec)

6
var/spack/repos/builtin/packages/jdk/package.py
View file

@ -68,3 +68,9 @@ def do_fetch(self, mirror_only=False):
def install(self, spec, prefix): def install(self, spec, prefix):
distutils.dir_util.copy_tree(".", prefix) distutils.dir_util.copy_tree(".", prefix)
def setup_environment(self, spack_env, run_env):
run_env.set('JAVA_HOME', self.spec.prefix)
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
spack_env.set('JAVA_HOME', self.spec.prefix)