TyphonIO: new package + Updated MACSio package (#6177)

2 files changed, 66 insertions, 8 deletions

diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py
index ea28d03352..f17cec4350 100644
--- a/var/spack/repos/builtin/packages/macsio/package.py
+++ b/var/spack/repos/builtin/packages/macsio/package.py
@@ -47,8 +47,7 @@ class Macsio(CMakePackage):
     variant('pdb', default=False, description="Build PDB plugin")
     variant('exodus', default=False, description="Build EXODUS plugin")
     variant('scr', default=False, description="Build with SCR support")
-    # TODO: typhonio not in spack
-    # variant('typhonio', default=False, description="Build TYPHONIO plugin")
+    variant('typhonio', default=False, description="Build TYPHONIO plugin")
 
     depends_on('json-cwx')
     depends_on('mpi', when="+mpi")
@@ -58,7 +57,7 @@ class Macsio(CMakePackage):
     depends_on('exodusii', when="+exodus")
     # pdb is packaged with silo
     depends_on('silo', when="+pdb")
-    # depends_on('typhonio', when="+typhonio")
+    depends_on('typhonio', when="+typhonio")
     depends_on('scr', when="+scr")
 
     def cmake_args(self):
@@ -101,11 +100,10 @@ class Macsio(CMakePackage):
             #     cmake_args.append("-DWITH_ZLIB_PREFIX={0}"
             #         .format(spec['silo'].prefix))
 
-        # TODO: typhonio not in spack
-        # if "+typhonio" in spec:
-        #     cmake_args.append("-DENABLE_TYPHONIO=ON")
-        #     cmake_args.append("-DWITH_TYPHONIO_PREFIX={0}"
-        #         .format(spec['typhonio'].prefix))
+        if "+typhonio" in spec:
+            cmake_args.append("-DENABLE_TYPHONIO_PLUGIN=ON")
+            cmake_args.append("-DWITH_TYPHONIO_PREFIX={0}"
+                              .format(spec['typhonio'].prefix))
 
         if "+exodus" in spec:
             cmake_args.append("-DENABLE_EXODUS_PLUGIN=ON")
diff --git a/var/spack/repos/builtin/packages/typhonio/package.py b/var/spack/repos/builtin/packages/typhonio/package.py
new file mode 100644
index 0000000000..35fe269fd6
--- /dev/null
+++ b/var/spack/repos/builtin/packages/typhonio/package.py
@@ -0,0 +1,60 @@
+##############################################################################
+# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack/spack
+# Please also see the NOTICE and LICENSE files 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 Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, 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 Lesser 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 spack import *
+
+
+class Typhonio(CMakePackage):
+    """TyphonIO is a library of routines that perform input/output (I/O)
+        of scientific data within application codes"""
+
+    homepage = "http://uk-mac.github.io/typhonio/"
+    url      = "https://github.com/UK-MAC/typhonio/archive/v1.6_CMake.tar.gz"
+
+    version('1.6_CMake', '8e8b2940a57874205e6d451856db5c2755884bf9')
+    version('develop', git='https://github.com/UK-MAC/typhonio.git',
+            branch='cmake_build')
+
+    variant('build_type', default='Release', description='The build type to build',
+        values=('Debug', 'Release'))
+    variant('fortran', default=False, description='Enable Fortran support')
+    variant('shared', default=False, description='Build shared libraries')
+    variant('docs', default=False, description='Build user guide and doxygen documentation')
+
+    depends_on('mpi')
+    depends_on('hdf5')
+
+    def cmake_args(self):
+        spec = self.spec
+        cmake_args = []
+
+        if "+fortran" in spec:
+            cmake_args.append("-DBUILD_FORTRAN_LIBRARY=ON")
+        if "+shared" in spec:
+            cmake_args.append("-DBUILD_TIO_SHARED=ON")
+        if "+docs" in spec:
+            cmake_args.append("-DBUILD_DOXYGEN_DOCS=ON")
+            cmake_args.append("-DBUILD_USER_GUIDE=ON")
+
+        return cmake_args