summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2015-04-07 21:49:00 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2015-04-08 00:20:53 -0700
commitc4a6d0413161c519ed3a0ddb8a9cf3cc5a422f20 (patch)
tree212099412850de9f1c0c7cb4c361480d489ca70a
parent203fd861aa1ab3d29477fa9954717ad46890801f (diff)
downloadspack-c4a6d0413161c519ed3a0ddb8a9cf3cc5a422f20.tar.gz
spack-c4a6d0413161c519ed3a0ddb8a9cf3cc5a422f20.tar.bz2
spack-c4a6d0413161c519ed3a0ddb8a9cf3cc5a422f20.tar.xz
spack-c4a6d0413161c519ed3a0ddb8a9cf3cc5a422f20.zip
Start of DIY command.
-rw-r--r--lib/spack/spack/cmd/diy.py57
-rw-r--r--lib/spack/spack/cmd/install.py3
-rw-r--r--lib/spack/spack/package.py12
3 files changed, 69 insertions, 3 deletions
diff --git a/lib/spack/spack/cmd/diy.py b/lib/spack/spack/cmd/diy.py
new file mode 100644
index 0000000000..62ab2d11fe
--- /dev/null
+++ b/lib/spack/spack/cmd/diy.py
@@ -0,0 +1,57 @@
+##############################################################################
+# 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 external import argparse
+import spack
+import spack.cmd
+
+description = "Build a package for an existing source directory."
+
+def setup_parser(subparser):
+ subparser.add_argument(
+ '-i', '--ignore-dependencies', action='store_true', dest='ignore_deps',
+ help="Do not try to install dependencies of requested packages.")
+ subparser.add_argument(
+ '--keep-prefix', action='store_true', dest='keep_prefix',
+ help="Don't remove the install prefix if installation fails.")
+ subparser.add_argument(
+ 'spec', nargs=argparse.REMAINDER,
+ help="specs to use for install. Must contain package AND verison.")
+
+
+def diy(self, args):
+ if not args.spec:
+ tty.die("spack diy requires a package spec argument.")
+
+ specs = spack.cmd.parse_specs(args.specs, concretize=True)
+ if len(specs) > 1:
+ tty.die("spack diy only takes one spec.")
+
+ spec = specs[0]
+ package = spack.db.get(spec)
+
+ package.do_install(
+ keep_prefix=args.keep_prefix,
+ ignore_deps=args.ignore_deps,
+ keep_stage=True) # don't remove stage dir for diy.
diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py
index 11b50f8fcf..820444a404 100644
--- a/lib/spack/spack/cmd/install.py
+++ b/lib/spack/spack/cmd/install.py
@@ -22,7 +22,6 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
-import sys
from external import argparse
import llnl.util.tty as tty
@@ -64,7 +63,7 @@ def install(parser, args):
tty.die("The -j option must be a positive integer!")
if args.no_checksum:
- spack.do_checksum = False
+ spack.do_checksum = False # TODO: remove this global.
specs = spack.cmd.parse_specs(args.packages, concretize=True)
for spec in specs:
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 908fd86a87..7d9eca5077 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -481,6 +481,12 @@ class Package(object):
return self._stage
+ @stage.setter
+ def stage(self, stage):
+ """Allow a stage object to be set to override the default."""
+ self._stage = stage
+
+
@property
def fetcher(self):
if not self.spec.versions.concrete:
@@ -787,6 +793,7 @@ class Package(object):
keep_stage = kwargs.get('keep_stage', False)
ignore_deps = kwargs.get('ignore_deps', False)
fake_install = kwargs.get('fake', False)
+ skip_patch = kwargs.get('skip_patch', False)
# Override builtin number of make jobs.
self.make_jobs = kwargs.get('make_jobs', None)
@@ -805,7 +812,10 @@ class Package(object):
start_time = time.time()
if not fake_install:
- self.do_patch()
+ if not skip_patch:
+ self.do_patch()
+ else:
+ self.do_stage()
# create the install directory. The install layout
# handles this in case so that it can use whatever