Merge branch 'features/git-fetching' into develop

Conflicts:
	lib/spack/docs/packaging_guide.rst
	lib/spack/spack/cmd/info.py
	lib/spack/spack/package.py
	lib/spack/spack/stage.py

9 files changed, 61 insertions, 9 deletions

diff --git a/var/spack/mock_packages/dyninst/package.py b/var/spack/mock_packages/dyninst/package.py
index 7657e2c33f..7998578da1 100644
--- a/var/spack/mock_packages/dyninst/package.py
+++ b/var/spack/mock_packages/dyninst/package.py
@@ -26,11 +26,14 @@ from spack import *
 
 class Dyninst(Package):
     homepage = "https://paradyn.org"
-    url      = "http://www.dyninst.org/sites/default/files/downloads/dyninst/8.1.2/DyninstAPI-8.1.2.tgz"
-    list_url = "http://www.dyninst.org/downloads/dyninst-8.x"
+    url      = "http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz"
 
-    version('8.1.2', 'bf03b33375afa66fe0efa46ce3f4b17a')
-    version('8.1.1', '1f8743e3a5662b25ce64a7edf647e77d')
+    version('8.2',   'cxyzab',
+            url='http://www.paradyn.org/release8.2/DyninstAPI-8.2.tgz')
+    version('8.1.2', 'bcxyza',
+            url='http://www.paradyn.org/release8.1.2/DyninstAPI-8.1.2.tgz')
+    version('8.1.1', 'abcxyz',
+            url='http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz')
 
     depends_on("libelf")
     depends_on("libdwarf")
diff --git a/var/spack/mock_packages/git-test/package.py b/var/spack/mock_packages/git-test/package.py
new file mode 100644
index 0000000000..689185463c
--- /dev/null
+++ b/var/spack/mock_packages/git-test/package.py
@@ -0,0 +1,10 @@
+from spack import *
+
+class GitTest(Package):
+    """Mock package that uses git for fetching."""
+    homepage = "http://www.git-fetch-example.com"
+
+    version('git', git='to-be-filled-in-by-test')
+
+    def install(self, spec, prefix):
+        pass
diff --git a/var/spack/mock_packages/hg-test/package.py b/var/spack/mock_packages/hg-test/package.py
new file mode 100644
index 0000000000..462f1e4c3a
--- /dev/null
+++ b/var/spack/mock_packages/hg-test/package.py
@@ -0,0 +1,10 @@
+from spack import *
+
+class HgTest(Package):
+    """Test package that does fetching with mercurial."""
+    homepage = "http://www.hg-fetch-example.com"
+
+    version('hg', hg='to-be-filled-in-by-test')
+
+    def install(self, spec, prefix):
+        pass
diff --git a/var/spack/mock_packages/svn-test/package.py b/var/spack/mock_packages/svn-test/package.py
new file mode 100644
index 0000000000..ba4d5522b4
--- /dev/null
+++ b/var/spack/mock_packages/svn-test/package.py
@@ -0,0 +1,10 @@
+from spack import *
+
+class SvnTest(Package):
+    """Mock package that uses svn for fetching."""
+    url      = "http://www.example.com/svn-test-1.0.tar.gz"
+
+    version('svn', 'to-be-filled-in-by-test')
+
+    def install(self, spec, prefix):
+        pass
diff --git a/var/spack/packages/callpath/package.py b/var/spack/packages/callpath/package.py
index f78ddcbc0c..f8a1eab9f7 100644
--- a/var/spack/packages/callpath/package.py
+++ b/var/spack/packages/callpath/package.py
@@ -34,6 +34,8 @@ class Callpath(Package):
     version('1.0.2', 'b1994d5ee7c7db9d27586fc2dcf8f373')
     version('1.0.1', '0047983d2a52c5c335f8ba7f5bab2325')
 
+    depends_on("libelf")
+    depends_on("libdwarf")
     depends_on("dyninst")
     depends_on("adept-utils")
     depends_on("mpi")
diff --git a/var/spack/packages/libmonitor/package.py b/var/spack/packages/libmonitor/package.py
index 210712436a..ed619e4cce 100644
--- a/var/spack/packages/libmonitor/package.py
+++ b/var/spack/packages/libmonitor/package.py
@@ -27,9 +27,8 @@ from spack import *
 class Libmonitor(Package):
     """Libmonitor is a library for process and thread control."""
     homepage = "http://hpctoolkit.org"
-    url      = "file:///g/g0/legendre/tools/oss/openspeedshop-release-2.1/SOURCES/libmonitor-20130218.tar.gz"
 
-    version('20130218', 'aa85c2c580e2dafb823cc47b09374279')
+    version('20130218', svn='https://outreach.scidac.gov/svn/libmonitor/trunk', revision=146)
 
     def install(self, spec, prefix):
         configure("--prefix=" + prefix)
diff --git a/var/spack/packages/lwm2/package.py b/var/spack/packages/lwm2/package.py
new file mode 100644
index 0000000000..31afff8816
--- /dev/null
+++ b/var/spack/packages/lwm2/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class Lwm2(Package):
+    """LWM2: Light Weight Measurement Module.  This is a PMPI module
+       that can collect a number of time-sliced MPI and POSIX I/O
+       measurements from a program.
+    """
+    homepage = "https://jay.grs.rwth-aachen.de/redmine/projects/lwm2"
+
+    version('torus', hg='https://jay.grs.rwth-aachen.de/hg/lwm2', revision='torus')
+
+    depends_on("papi")
+    depends_on("mpi")
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" % prefix)
+        make()
+        make("install")
diff --git a/var/spack/packages/paraver/package.py b/var/spack/packages/paraver/package.py
index 45bac95b28..5f8a153d4c 100644
--- a/var/spack/packages/paraver/package.py
+++ b/var/spack/packages/paraver/package.py
@@ -7,9 +7,9 @@ class Paraver(Package):
         is expressed on its input trace format.  Traces for parallel MPI,
         OpenMP and other programs can be genereated with Extrae."""
     homepage = "http://www.bsc.es/computer-sciences/performance-tools/paraver"
-    url      = "http://www.bsc.es/ssl/apps/performanceTools/files/paraver-sources-4.5.2.tar.gz"
+    url      = "http://www.bsc.es/ssl/apps/performanceTools/files/paraver-sources-4.5.3.tar.gz"
 
-    version('4.5.2', 'ea463dd494519395c99ebae294edee17')
+    version('4.5.3', '625de9ec0d639acd18d1aaa644b38f72')
 
     depends_on("boost")
     #depends_on("extrae")
diff --git a/var/spack/packages/stat/package.py b/var/spack/packages/stat/package.py
index 5df07975f7..05e74b6a84 100644
--- a/var/spack/packages/stat/package.py
+++ b/var/spack/packages/stat/package.py
@@ -5,8 +5,8 @@ class Stat(Package):
     homepage = "http://paradyn.org/STAT/STAT.html"
     url      = "https://github.com/lee218llnl/stat/archive/v2.0.0.tar.gz"
 
-    version('2.0.0', 'c7494210b0ba26b577171b92838e1a9b')
     version('2.1.0', 'ece26beaf057aa9134d62adcdda1ba91')
+    version('2.0.0', 'c7494210b0ba26b577171b92838e1a9b')
 
     depends_on('libdwarf')
     depends_on('dyninst')