diff options
| author | David Boehme <boehme3@llnl.gov> | 2014-10-08 17:31:44 -0700 |
|---|---|---|
| committer | David Boehme <boehme3@llnl.gov> | 2014-10-08 17:31:44 -0700 |
| commit | 41c46c22790803534f755168639484985b29c88a (patch) | |
| tree | 25bcd3e44f43a434cdc5875425e47a022b150832 | |
| parent | 8857b1f69e4a2dca5d08e7817c69e080da8e8266 (diff) | |
| parent | dd2cea4107b5c8b29121932967c6527781329266 (diff) | |
| download | spack-41c46c22790803534f755168639484985b29c88a.tar.gz spack-41c46c22790803534f755168639484985b29c88a.tar.bz2 spack-41c46c22790803534f755168639484985b29c88a.tar.xz spack-41c46c22790803534f755168639484985b29c88a.zip | |
Merge branch 'develop' of ssh://cz-stash.llnl.gov:7999/scale/spack into develop
| -rw-r--r-- | lib/spack/docs/Makefile | 4 | ||||
| -rw-r--r-- | lib/spack/spack/cmd/info.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/spack/docs/Makefile b/lib/spack/docs/Makefile index 4d71c2052e..e3068ea10c 100644 --- a/lib/spack/docs/Makefile +++ b/lib/spack/docs/Makefile @@ -42,12 +42,14 @@ gh-pages: _build/html touch .nojekyll && \ git init && \ git add . && \ - git commit -m "Initial commit" && \ + git commit -m "Spack Documentation" && \ git push -f $$root master:gh-pages && \ rm -rf .git upload: rsync -avz --rsh=ssh --delete _build/html/ cab:/usr/global/web-pages/lc/www/adept/docs/spack + git push -f origin gh-pages + git push -f github gh-pages apidoc: sphinx-apidoc -T -o . $(PYTHONPATH)/spack diff --git a/lib/spack/spack/cmd/info.py b/lib/spack/spack/cmd/info.py index c86dcac2f5..87d272dbc6 100644 --- a/lib/spack/spack/cmd/info.py +++ b/lib/spack/spack/cmd/info.py @@ -94,6 +94,9 @@ def info_rst(): print " * `Homepage <%s>`__" % pkg.homepage print " * `%s/package.py <%s>`__" % (pkg.name, github_url(pkg)) print + if pkg.versions: + print "Versions:" + print " " + ", ".join(str(v) for v in reversed(sorted(pkg.versions))) if pkg.dependencies: print "Dependencies" print " " + ", ".join("`%s`_" % d if d != "mpi" else d |