Overhaul of compression libraries

8 files changed, 110 insertions, 9 deletions

diff --git a/var/spack/repos/builtin/packages/expat/package.py b/var/spack/repos/builtin/packages/expat/package.py
index 7d0fdae1d4..7e56bddd15 100644
--- a/var/spack/repos/builtin/packages/expat/package.py
+++ b/var/spack/repos/builtin/packages/expat/package.py
@@ -28,15 +28,15 @@ from spack import *
 class Expat(Package):
     """<eXpat/> is an XML parser library written in C"""
     homepage = "http://expat.sourceforge.net/"
-    url      = "http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz"
 
-    version('2.1.0', 'dd7dab7a5fea97d2a6a43f511449b7cd')
-
-    depends_on('cmake', type='build')
+    version('2.2.0', '2f47841c829facb346eb6e3fab5212e2',
+            url="http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2")
+    version('2.1.0', 'dd7dab7a5fea97d2a6a43f511449b7cd',
+            url="http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz")
 
     def install(self, spec, prefix):
+        configure('--prefix={0}'.format(prefix))
 
-        with working_dir('spack-build', create=True):
-            cmake('..', *std_cmake_args)
-            make()
-            make('install')
+        make()
+        make('check')
+        make('install')
diff --git a/var/spack/repos/builtin/packages/jsoncpp/package.py b/var/spack/repos/builtin/packages/jsoncpp/package.py
new file mode 100644
index 0000000000..6eb4e93b5c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/jsoncpp/package.py
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2013-2016, 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
+# Please also see the LICENSE file 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 Jsoncpp(Package):
+    """JsonCpp is a C++ library that allows manipulating JSON values,
+    including serialization and deserialization to and from strings.
+    It can also preserve existing comment in unserialization/serialization
+    steps, making it a convenient format to store user input files."""
+
+    homepage = "https://github.com/open-source-parsers/jsoncpp"
+    url      = "https://github.com/open-source-parsers/jsoncpp/archive/1.7.3.tar.gz"
+
+    version('1.7.3', 'aff6bfb5b81d9a28785429faa45839c5')
+
+    # Avoid circular dependency
+    #depends_on('cmake~jsoncpp', type='build')
+    depends_on('cmake', type='build')
+    # depends_on('python', type='test')
+
+    def install(self, spec, prefix):
+        with working_dir('spack-build', create=True):
+            cmake('..', '-DBUILD_SHARED_LIBS=ON', *std_cmake_args)
+
+            make()
+            # make('test')  # Python needed to run tests
+            make('install')
diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py
index 0f4810fa8a..214a027805 100644
--- a/var/spack/repos/builtin/packages/libxml2/package.py
+++ b/var/spack/repos/builtin/packages/libxml2/package.py
@@ -32,6 +32,7 @@ class Libxml2(Package):
     homepage = "http://xmlsoft.org"
     url      = "http://xmlsoft.org/sources/libxml2-2.9.2.tar.gz"
 
+    version('2.9.4', 'ae249165c173b1ff386ee8ad676815f5')
     version('2.9.2', '9e6a9aca9d155737868b3dc5fd82f788')
 
     variant('python', default=False, description='Enable Python support')
@@ -53,4 +54,5 @@ class Libxml2(Package):
                   *python_args)
 
         make()
+        make("check")
         make("install")
diff --git a/var/spack/repos/builtin/packages/lz4/package.py b/var/spack/repos/builtin/packages/lz4/package.py
new file mode 100644
index 0000000000..89356a607c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/lz4/package.py
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2013-2016, 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
+# Please also see the LICENSE file 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 Lz4(Package):
+    """LZ4 is lossless compression algorithm, providing compression speed
+    at 400 MB/s per core, scalable with multi-cores CPU. It also features
+    an extremely fast decoder, with speed in multiple GB/s per core,
+    typically reaching RAM speed limits on multi-core systems."""
+
+    homepage = "http://cyan4973.github.io/lz4/"
+    url      = "https://github.com/Cyan4973/lz4/archive/r131.tar.gz"
+
+    version('131', '42b09fab42331da9d3fb33bd5c560de9')
+
+    # depends_on('valgrind', type='test')
+
+    def install(self, spec, prefix):
+        make()
+        # make('test')  # requires valgrind to be installed
+        make('install', 'PREFIX={0}'.format(prefix))
diff --git a/var/spack/repos/builtin/packages/lzo/package.py b/var/spack/repos/builtin/packages/lzo/package.py
index 0961bbb58c..7702186cbd 100644
--- a/var/spack/repos/builtin/packages/lzo/package.py
+++ b/var/spack/repos/builtin/packages/lzo/package.py
@@ -46,4 +46,5 @@ class Lzo(Package):
         configure(*configure_args)
         make()
         make('check')
+        make('test')  # more exhaustive test
         make('install')
diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py
index 02e9ef5f1e..52644fa8a4 100644
--- a/var/spack/repos/builtin/packages/nettle/package.py
+++ b/var/spack/repos/builtin/packages/nettle/package.py
@@ -29,9 +29,10 @@ class Nettle(Package):
     """The Nettle package contains the low-level cryptographic library
     that is designed to fit easily in many contexts."""
 
-    homepage = "http://www.example.com"
+    homepage = "https://www.lysator.liu.se/~nisse/nettle/"
     url      = "http://ftp.gnu.org/gnu/nettle/nettle-2.7.1.tar.gz"
 
+    version('3.2', 'afb15b4764ebf1b4e6d06c62bd4d29e4')
     version('2.7', '2caa1bd667c35db71becb93c5d89737f')
 
     depends_on('gmp')
@@ -39,4 +40,5 @@ class Nettle(Package):
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
         make()
+        make("check")
         make("install")
diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py
index a8ab959a62..5b46e838ed 100644
--- a/var/spack/repos/builtin/packages/xz/package.py
+++ b/var/spack/repos/builtin/packages/xz/package.py
@@ -39,4 +39,5 @@ class Xz(Package):
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix)
         make()
+        make("check")
         make("install")
diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py
index 6d799fb05a..7145b78d63 100644
--- a/var/spack/repos/builtin/packages/zlib/package.py
+++ b/var/spack/repos/builtin/packages/zlib/package.py
@@ -38,4 +38,5 @@ class Zlib(Package):
         configure("--prefix=%s" % prefix)
 
         make()
+        make("test")
         make("install")