Update packaging tutorial (#6270)

* Allow types and 'any' in variant definitions.

- Previously variant values had to be a tuple or a callable predicate.

- This allows 'any' as shorthand for `lambda x: True` and type objects
  as shorthand for "any value of this type".

- Makes variant definitions more readable, keeps lambdas out of
  packages for common cases.

* Update packaging tutorial

* Fix bad file reference in packaging tutorial

lib/spack/docs/tutorial/examples/0.package.py

@@ -40,7 +40,7 @@
 from spack import *
 
 
-class Mpileaks(AutotoolsPackage):
+class Mpileaks(Package):
     """FIXME: Put a proper description of your package here."""
 
     # FIXME: Add a proper url for your package's homepage here.
@@ -50,14 +50,9 @@ class Mpileaks(AutotoolsPackage):
     version('1.0', '8838c574b39202a57d7c2d68692718aa')
 
     # FIXME: Add dependencies if required.
-    # depends_on('m4', type='build')
-    # depends_on('autoconf', type='build')
-    # depends_on('automake', type='build')
-    # depends_on('libtool', type='build')
     # depends_on('foo')
 
-    def configure_args(self):
-        # FIXME: Add arguments other than --prefix
-        # FIXME: If not needed delete the function
-        args = []
-        return args
+    def install(self, spec, prefix):
+        # FIXME: Unknown build system
+        make()
+        make('install')

lib/spack/docs/tutorial/examples/1.package.py

@@ -25,7 +25,7 @@
 from spack import *
 
 
-class Mpileaks(AutotoolsPackage):
+class Mpileaks(Package):
     """Tool to detect and report MPI objects like MPI_Requests and
     MPI_Datatypes."""
 
@@ -35,14 +35,9 @@ class Mpileaks(AutotoolsPackage):
     version('1.0', '8838c574b39202a57d7c2d68692718aa')
 
     # FIXME: Add dependencies if required.
-    # depends_on('m4', type='build')
-    # depends_on('autoconf', type='build')
-    # depends_on('automake', type='build')
-    # depends_on('libtool', type='build')
     # depends_on('foo')
 
-    def configure_args(self):
-        # FIXME: Add arguments other than --prefix
-        # FIXME: If not needed delete the function
-        args = []
-        return args
+    def install(self, spec, prefix):
+        # FIXME: Unknown build system
+        make()
+        make('install')

lib/spack/docs/tutorial/examples/2.package.py

@@ -25,7 +25,7 @@
 from spack import *
 
 
-class Mpileaks(AutotoolsPackage):
+class Mpileaks(Package):
     """Tool to detect and report MPI objects like MPI_Requests and
     MPI_Datatypes."""
 
@@ -38,8 +38,7 @@ class Mpileaks(AutotoolsPackage):
     depends_on('adept-utils')
     depends_on('callpath')
 
-    def configure_args(self):
-        # FIXME: Add arguments other than --prefix
-        # FIXME: If not needed delete the function
-        args = []
-        return args
+    def install(self, spec, prefix):
+        # FIXME: Unknown build system
+        make()
+        make('install')

lib/spack/docs/tutorial/examples/3.package.py

@@ -25,9 +25,10 @@
 from spack import *
 
 
-class Mpileaks(AutotoolsPackage):
+class Mpileaks(Package):
     """Tool to detect and report MPI objects like MPI_Requests and
     MPI_Datatypes."""
+
     homepage = "https://github.com/hpc/mpileaks"
     url      = "https://github.com/hpc/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz"
 
@@ -37,7 +38,7 @@ class Mpileaks(AutotoolsPackage):
     depends_on('adept-utils')
     depends_on('callpath')
 
-    def configure_args(self):
-        args = ['--with-adept-utils=%s' % self.spec['adept-utils'].prefix,
-                '--with-callpath=%s' % self.spec['callpath'].prefix]
-        return args
+    def install(self, spec, prefix):
+        configure()
+        make()
+        make('install')

lib/spack/docs/tutorial/examples/4.package.py

@@ -25,7 +25,7 @@
 from spack import *
 
 
-class Mpileaks(AutotoolsPackage):
+class Mpileaks(Package):
     """Tool to detect and report MPI objects like MPI_Requests and
     MPI_Datatypes."""
 
@@ -34,17 +34,13 @@ class Mpileaks(AutotoolsPackage):
 
     version('1.0', '8838c574b39202a57d7c2d68692718aa')
 
-    variant('stackstart', default=0, description='Specify the number of stack frames to truncate.')
-
     depends_on('mpi')
     depends_on('adept-utils')
     depends_on('callpath')
 
-    def configure_args(self):
-        args = ['--with-adept-utils=%s' % self.spec['adept-utils'].prefix,
-                '--with-callpath=%s' % self.spec['callpath'].prefix]
-        stackstart = int(self.spec.variants['stackstart'].value)
-        if stackstart:
-            args.extend(['--with-stack-start-c=%s' % stackstart,
-                         '--with-stack-start-fortran=%s' % stackstart])
-        return args
+    def install(self, spec, prefix):
+        configure('--with-adept-utils=%s' % self.spec['adept-utils'].prefix,
+                  '--with-callpath=%s' % self.spec['callpath'].prefix,
+                  '--prefix=%s' % self.spec.prefix)
+        make()
+        make('install')

lib/spack/docs/tutorial/examples/5.package.py

@@ -0,0 +1,53 @@
+##############################################################################
+# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/spack/spack
+# Please also see the NOTICE and LICENSE files 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 Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, 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 Lesser 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 Mpileaks(Package):
+    """Tool to detect and report MPI objects like MPI_Requests and
+    MPI_Datatypes."""
+
+    homepage = "https://github.com/hpc/mpileaks"
+    url      = "https://github.com/hpc/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz"
+
+    version('1.0', '8838c574b39202a57d7c2d68692718aa')
+
+    variant('stackstart', values=int, default=0, description='Specify the number of stack frames to truncate.')
+
+    depends_on('mpi')
+    depends_on('adept-utils')
+    depends_on('callpath')
+
+    def install(self, spec, prefix):
+        stackstart = int(self.spec.variants['stackstart'].value)
+        confargs = ['--with-adept-utils=%s' % self.spec['adept-utils'].prefix,
+                    '--with-callpath=%s' % self.spec['callpath'].prefix,
+                    '--prefix=%s' % self.spec.prefix]
+        if stackstart:
+            confargs.extend(['--with-stack-start-c=%s' % stackstart,
+                             '--with-stack-start-fortran=%s' % stackstart])
+        configure(*confargs)
+        make()
+        make('install')