[WIP] Release 2.0 of the ECP Proxy Apps suite (#9368)

* Release 2.0 of the ECP Proxy Apps suite

* update laghos version

* make install dir structure consistent across all ecp-proxy-apps

* minor

* update macsio version

5 files changed, 42 insertions, 18 deletions

diff --git a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py
index cc3a45849a..b792ae3f77 100644
--- a/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py
+++ b/var/spack/repos/builtin/packages/ecp-proxy-apps/package.py
@@ -33,30 +33,50 @@ class EcpProxyApps(Package):
        installs the ECP proxy application suite.
     """
 
-    homepage = "https://exascaleproject.github.io/proxy-apps"
+    tags = ['proxy-app', 'ecp-proxy-app']
+    maintainers = ['bhatele']
 
+    homepage = "https://exascaleproject.github.io/proxy-apps"
     # Dummy url
     url = 'https://github.com/exascaleproject/proxy-apps/archive/v1.0.tar.gz'
 
-    tags = ['proxy-app', 'ecp-proxy-app']
-
+    version('2.0', sha256='5f3cb3a772224e738c1dab42fb34d40f6b313af51ab1c575fb334e573e41e09a')
     version('1.1', '15825c318acd3726fd8e72803b1c1090')
     version('1.0', '8b3f00f05e6cde88d8d913da4293ee62')
 
+    # Added with release 2.0
+    depends_on('ember@1.0.0', when='@2.0:')
+    depends_on('miniqmc@0.4.0', when='@2.0:')
+    depends_on('minivite@1.0', when='@2.0:')
+    depends_on('picsarlite@0.1', when='@2.0:')
+    depends_on('thornado-mini@1.0', when='@2.0:')
+
+    depends_on('amg@1.1', when='@2.0:')
+    depends_on('candle-benchmarks@0.1', when='@2.0:')
+    depends_on('laghos@1.1', when='@2.0:')
+    depends_on('macsio@1.1', when='@2.0:')
+    depends_on('miniamr@1.4.1', when='@2.0:')
+    depends_on('sw4lite@1.1', when='@2.0:')
+    depends_on('xsbench@18', when='@2.0:')
+
     # Added with release 1.1
     depends_on('examinimd@1.0', when='@1.1:')
 
-    depends_on('amg@1.0', when='@1.0:')
-    depends_on('candle-benchmarks@0.0', when='@1.0:')
-    depends_on('laghos@1.0', when='@1.0:')
-    depends_on('macsio@1.0', when='@1.0:')
-    depends_on('miniamr@1.4.0', when='@1.0:')
-    depends_on('minife@2.1.0', when='@1.0:')
-    depends_on('minitri@1.0', when='@1.0:')
     depends_on('nekbone@17.0', when='@1.0:')
-    depends_on('sw4lite@1.0', when='@1.0:')
     depends_on('swfft@1.0', when='@1.0:')
-    depends_on('xsbench@14', when='@1.0:')
+
+    # Dependencies for versions 1.0:1.1
+    depends_on('amg@1.0', when='@1.0:1.1')
+    depends_on('candle-benchmarks@0.0', when='@1.0:1.1')
+    depends_on('laghos@1.0', when='@1.0:1.1')
+    depends_on('macsio@1.0', when='@1.0:1.1')
+    depends_on('miniamr@1.4.0', when='@1.0:1.1')
+    depends_on('sw4lite@1.0', when='@1.0:1.1')
+    depends_on('xsbench@14', when='@1.0:1.1')
+
+    # Removed after release 1.1
+    depends_on('minife@2.1.0', when='@1.0:1.1')
+    depends_on('minitri@1.0', when='@1.0:1.1')
 
     # Removed after release 1.0
     depends_on('comd@1.1', when='@1.0')
diff --git a/var/spack/repos/builtin/packages/examinimd/package.py b/var/spack/repos/builtin/packages/examinimd/package.py
index f4a493342b..2bf30715b4 100644
--- a/var/spack/repos/builtin/packages/examinimd/package.py
+++ b/var/spack/repos/builtin/packages/examinimd/package.py
@@ -81,6 +81,6 @@ class Examinimd(MakefilePackage):
         mkdirp(prefix.bin)
         install('src/ExaMiniMD', prefix.bin)
         install_tree('input', prefix.input)
-        mkdirp(prefix.doc)
-        install('README.md', prefix.doc)
-        install('LICENSE', prefix.doc)
+        mkdirp(prefix.docs)
+        install('README.md', prefix.docs)
+        install('LICENSE', prefix.docs)
diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py
index 53cdb14842..7539f6341a 100644
--- a/var/spack/repos/builtin/packages/macsio/package.py
+++ b/var/spack/repos/builtin/packages/macsio/package.py
@@ -116,3 +116,7 @@ class Macsio(CMakePackage):
                               .format(spec['netcdf'].prefix))
 
         return cmake_args
+
+    def install(self, spec, prefix):
+        mkdirp(prefix.bin)
+        install('spack-build/macsio/macsio', prefix.bin)
diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py
index c4aa2a0f61..cc97e0e3e5 100644
--- a/var/spack/repos/builtin/packages/miniamr/package.py
+++ b/var/spack/repos/builtin/packages/miniamr/package.py
@@ -60,8 +60,8 @@ class Miniamr(MakefilePackage):
     def install(self, spec, prefix):
         # Manual installation
         mkdir(prefix.bin)
-        mkdir(prefix.doc)
+        mkdir(prefix.docs)
 
         install('ref/ma.x', prefix.bin)
         # Install Support Documents
-        install('ref/README', prefix.doc)
+        install('ref/README', prefix.docs)
diff --git a/var/spack/repos/builtin/packages/miniqmc/package.py b/var/spack/repos/builtin/packages/miniqmc/package.py
index e7b53c84e6..974b1f9b86 100644
--- a/var/spack/repos/builtin/packages/miniqmc/package.py
+++ b/var/spack/repos/builtin/packages/miniqmc/package.py
@@ -26,7 +26,7 @@ from spack import *
 
 
 class Miniqmc(CMakePackage):
-    """a simplified real space QMC code for algorithm development,
+    """A simplified real space QMC code for algorithm development,
        performance portability testing, and computer science experiments
     """