Merge branch 'features/callpath' into develop

5 files changed, 54 insertions, 6 deletions

diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index ec946cd2d7..182a5629fa 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -122,7 +122,7 @@ def set_build_environment_variables(pkg):
 
     # Prefixes of all of the package's dependencies go in
     # SPACK_DEPENDENCIES
-    dep_prefixes = [d.package.prefix for d in pkg.spec.dependencies.values()]
+    dep_prefixes = [d.prefix for d in pkg.spec.traverse(root=False)]
     path_set(SPACK_DEPENDENCIES, dep_prefixes)
 
     # Install prefix
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index b0a9dd76b9..3e253286e8 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -773,7 +773,7 @@ class Package(object):
                 ' '.join(formatted_deps))
 
         self.remove_prefix()
-        tty.msg("Successfully uninstalled %s." % self.spec)
+        tty.msg("Successfully uninstalled %s." % self.spec.short_spec)
 
         # Once everything else is done, run post install hooks
         spack.hooks.post_uninstall(self)
diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py
index bc27b25889..923c7c19a5 100644
--- a/lib/spack/spack/util/executable.py
+++ b/lib/spack/spack/util/executable.py
@@ -121,7 +121,7 @@ def which(name, **kwargs):
 
     for dir in path:
         exe = os.path.join(dir, name)
-        if os.access(exe, os.X_OK):
+        if os.path.isfile(exe) and os.access(exe, os.X_OK):
             return Executable(exe)
 
     if required:
diff --git a/var/spack/packages/adept-utils/package.py b/var/spack/packages/adept-utils/package.py
new file mode 100644
index 0000000000..2515322ec2
--- /dev/null
+++ b/var/spack/packages/adept-utils/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# 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://scalability-llnl.github.io/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 *
+
+class AdeptUtils(Package):
+    """Utility libraries for LLNL performance tools."""
+
+    homepage = "https://github.com/scalability-llnl/adept-utils"
+    url      = "https://github.com/scalability-llnl/adept-utils/archive/v1.0.tar.gz"
+
+    version('1.0', '5c6cd9badce56c945ac8551e34804397')
+
+    depends_on("boost")
+    depends_on("mpi")
+
+    def install(self, spec, prefix):
+        cmake(*std_cmake_args)
+        make()
+        make("install")
diff --git a/var/spack/packages/callpath/package.py b/var/spack/packages/callpath/package.py
index 5d92d77302..84170d9c9e 100644
--- a/var/spack/packages/callpath/package.py
+++ b/var/spack/packages/callpath/package.py
@@ -25,13 +25,20 @@
 from spack import *
 
 class Callpath(Package):
-    homepage = "https://github.com/tgamblin/callpath"
-    url      = "http://github.com/tgamblin/callpath-0.2.tar.gz"
+    """Library for representing callpaths consistently in
+       distributed-memory performance tools."""
+
+    homepage = "https://github.com/scalability-llnl/callpath"
+    url      = "https://github.com/scalability-llnl/callpath/archive/v1.0.1.tar.gz"
+
+    version('1.0.1', '0047983d2a52c5c335f8ba7f5bab2325')
 
     depends_on("dyninst")
+    depends_on("adept-utils")
     depends_on("mpi")
 
     def install(self, spec, prefix):
-        configure("--prefix=" + prefix)
+        # TODO: offer options for the walker used.
+        cmake('.', "-DCALLPATH_WALKER=dyninst", *std_cmake_args)
         make()
         make("install")