diff options
| -rw-r--r-- | lib/spack/spack/cmd/common/arguments.py | 4 | ||||
| -rw-r--r-- | lib/spack/spack/cmd/diy.py | 16 | ||||
| -rw-r--r-- | lib/spack/spack/cmd/install.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-yt/package.py | 8 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rockstar/package.py | 6 |
5 files changed, 34 insertions, 4 deletions
diff --git a/lib/spack/spack/cmd/common/arguments.py b/lib/spack/spack/cmd/common/arguments.py index f091b9cf75..c1fff4efa9 100644 --- a/lib/spack/spack/cmd/common/arguments.py +++ b/lib/spack/spack/cmd/common/arguments.py @@ -105,3 +105,7 @@ _arguments['long'] = Args( _arguments['very_long'] = Args( '-L', '--very-long', action='store_true', help='Show full dependency hashes as well as versions.') + +_arguments['jobs'] = Args( + '-j', '--jobs', action='store', type=int, dest="jobs", + help="Explicitly set number of make jobs. Default is #cpus.") diff --git a/lib/spack/spack/cmd/diy.py b/lib/spack/spack/cmd/diy.py index 22966a26eb..952fc563d1 100644 --- a/lib/spack/spack/cmd/diy.py +++ b/lib/spack/spack/cmd/diy.py @@ -38,6 +38,10 @@ description = "Do-It-Yourself: build from an existing source directory." def setup_parser(subparser): + arguments.add_common_arguments(subparser, ['jobs']) + subparser.add_argument( + '-d', '--source-path', dest='source_path', default=None, + help="Path to the source directory. Defaults to the current directory") subparser.add_argument( '-i', '--ignore-dependencies', action='store_true', dest='ignore_deps', help="Do not try to install dependencies of requested packages.") @@ -62,6 +66,10 @@ def diy(self, args): if not args.spec: tty.die("spack diy requires a package spec argument.") + if args.jobs is not None: + if args.jobs <= 0: + tty.die("The -j option must be a positive integer!") + specs = spack.cmd.parse_specs(args.spec) if len(specs) > 1: tty.die("spack diy only takes one spec.") @@ -91,13 +99,19 @@ def diy(self, args): tty.msg("Uninstall or try adding a version suffix for this DIY build.") sys.exit(1) + source_path = args.source_path + if source_path is None: + source_path = os.getcwd() + source_path = os.path.abspath(source_path) + # Forces the build to run out of the current directory. - package.stage = DIYStage(os.getcwd()) + package.stage = DIYStage(source_path) # TODO: make this an argument, not a global. spack.do_checksum = False package.do_install( + make_jobs=args.jobs, keep_prefix=args.keep_prefix, install_deps=not args.ignore_deps, verbose=not args.quiet, diff --git a/lib/spack/spack/cmd/install.py b/lib/spack/spack/cmd/install.py index 3731fe3c81..7b48f10724 100644 --- a/lib/spack/spack/cmd/install.py +++ b/lib/spack/spack/cmd/install.py @@ -54,9 +54,7 @@ The default is to install the package along with all its dependencies. Alternatively one can decide to install only the package or only the dependencies.""" ) - subparser.add_argument( - '-j', '--jobs', action='store', type=int, - help="Explicitly set number of make jobs. Default is #cpus.") + arguments.add_common_arguments(subparser, ['jobs']) subparser.add_argument( '--keep-prefix', action='store_true', dest='keep_prefix', help="Don't remove the install prefix if installation fails.") diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 4de7cf700e..547024fe43 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -53,7 +53,11 @@ class PyYt(Package): variant("astropy", default=True, description="enable astropy support") variant("h5py", default=True, description="enable h5py support") variant("scipy", default=True, description="enable scipy support") +<<<<<<< HEAD + variant("devmode", default=False, description="enable development mode") +======= variant("rockstar", default=False, description="enable rockstar support") +>>>>>>> update/yt-rockstar extends("python") @@ -70,6 +74,10 @@ class PyYt(Package): depends_on("python @2.7:2.999,3.4:") def install(self, spec, prefix): + if '+devmode' in spec: + setup_py("develop", "--prefix=%s" % prefix) + else: + setup_py("install", "--prefix=%s" % prefix) if '+rockstar' in spec: if os.path.exists('rockstar.cfg'): os.remove('rockstar.cfg') diff --git a/var/spack/repos/builtin/packages/rockstar/package.py b/var/spack/repos/builtin/packages/rockstar/package.py index 1235be58e0..993086410e 100644 --- a/var/spack/repos/builtin/packages/rockstar/package.py +++ b/var/spack/repos/builtin/packages/rockstar/package.py @@ -39,3 +39,9 @@ class Rockstar(Package): shutil.copytree(join_path(".",filename), join_path(prefix, filename)) else: install(filename, join_path(prefix, filename)) + + mkdir(prefix.bin) + mkdir(prefix.lib) + + install('rockstar', join_path(prefix.bin, 'rockstar')) + install('librockstar.so', join_path(prefix.lib, 'librockstar.so')) |