Fix #620, Resolve #664. Fix issues with build environment.

- Also added better regression tests for build environment.

var/spack/repos/builtin.mock/packages/cmake-client/package.py

@@ -0,0 +1,89 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+import os
+
+def check(condition, msg):
+    """Raise an install error if condition is False."""
+    if not condition:
+        raise InstallError(msg)
+
+
+class CmakeClient(Package):
+    """A dumy package that uses cmake."""
+    homepage  = 'https://www.example.com'
+    url       = 'https://www.example.com/cmake-client-1.0.tar.gz'
+
+    version('1.0', '4cb3ff35b2472aae70f542116d616e63')
+
+    depends_on('cmake')
+
+
+    def setup_environment(self, spack_env, run_env):
+        spack_cc    # Ensure spack module-scope variable is avaiabl
+        check(from_cmake == "from_cmake",
+              "setup_environment couldn't read global set by cmake.")
+
+        check(self.spec['cmake'].link_arg == "test link arg",
+              "link arg on dependency spec not readable from setup_environment.")
+
+
+    def setup_dependent_environment(self, spack_env, run_env, dspec):
+        spack_cc    # Ensure spack module-scope variable is avaiable
+        check(from_cmake == "from_cmake",
+              "setup_dependent_environment couldn't read global set by cmake.")
+
+        check(self.spec['cmake'].link_arg == "test link arg",
+              "link arg on dependency spec not readable from setup_dependent_environment.")
+
+
+    def setup_dependent_package(self, module, dspec):
+        spack_cc    # Ensure spack module-scope variable is avaiable
+        check(from_cmake == "from_cmake",
+              "setup_dependent_package couldn't read global set by cmake.")
+
+        check(self.spec['cmake'].link_arg == "test link arg",
+              "link arg on dependency spec not readable from setup_dependent_package.")
+
+
+
+    def install(self, spec, prefix):
+        # check that cmake is in the global scope.
+        global cmake
+        check(cmake is not None, "No cmake was in environment!")
+
+        # check that which('cmake') returns the right one.
+        cmake = which('cmake')
+        check(cmake.exe[0].startswith(spec['cmake'].prefix.bin),
+              "Wrong cmake was in environment: %s" % cmake)
+
+        check(from_cmake == "from_cmake",
+              "Couldn't read global set by cmake.")
+
+        check(os.environ['from_cmake'] == 'from_cmake',
+              "Couldn't read env var set in envieonmnt by dependency")
+
+        mkdirp(prefix.bin)
+        touch(join_path(prefix.bin, 'dummy'))

var/spack/repos/builtin.mock/packages/cmake/package.py

@@ -0,0 +1,69 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+import os
+
+def check(condition, msg):
+    """Raise an install error if condition is False."""
+    if not condition:
+        raise InstallError(msg)
+
+
+class Cmake(Package):
+    """A dumy package for the cmake build system."""
+    homepage  = 'https://www.cmake.org'
+    url       = 'https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz'
+
+    version('3.4.3',    '4cb3ff35b2472aae70f542116d616e63',
+            url='https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz')
+
+
+    def setup_environment(self, spack_env, run_env):
+        spack_cc    # Ensure spack module-scope variable is avaiable
+        spack_env.set('for_install', 'for_install')
+
+    def setup_dependent_environment(self, spack_env, run_env, dspec):
+        spack_cc    # Ensure spack module-scope variable is avaiable
+        spack_env.set('from_cmake', 'from_cmake')
+
+
+    def setup_dependent_package(self, module, dspec):
+        spack_cc    # Ensure spack module-scope variable is avaiable
+
+        self.spec.from_cmake = "from_cmake"
+        module.from_cmake = "from_cmake"
+
+        self.spec.link_arg = "test link arg"
+
+
+    def install(self, spec, prefix):
+        mkdirp(prefix.bin)
+
+        check(os.environ['for_install'] == 'for_install',
+              "Couldn't read env var set in compile envieonmnt")
+
+        cmake_exe = join_path(prefix.bin, 'cmake')
+        touch(cmake_exe)
+        set_executable(cmake_exe)