Update for 'magics' and 'libemos'. (#6275)

2 files changed, 95 insertions, 50 deletions

diff --git a/var/spack/repos/builtin/packages/libemos/package.py b/var/spack/repos/builtin/packages/libemos/package.py
index 8db882d4be..26febde67c 100644
--- a/var/spack/repos/builtin/packages/libemos/package.py
+++ b/var/spack/repos/builtin/packages/libemos/package.py
@@ -31,31 +31,37 @@ class Libemos(CMakePackage):
 
     homepage = "https://software.ecmwf.int/wiki/display/EMOS/Emoslib"
     url      = "https://software.ecmwf.int/wiki/download/attachments/3473472/libemos-4.4.2-Source.tar.gz"
+    list_url = "https://software.ecmwf.int/wiki/display/EMOS/Releases"
 
+    version('4.5.1', 'eec1ef4de841df3c68c08fa94d7939ff')
+    version('4.5.0', '0ad8962a73e3ca90a8094561adc81276')
+    version('4.4.9', '24d098cd062d443a544fe17727726285')
     version('4.4.7', '395dcf21cf06872f772fb6b73d8e67b9')
     version('4.4.2', 'f15a9aff0f40861f3f046c9088197376')
 
-    variant('eccodes', default=False,
-            description="Use eccodes instead of grib-api for GRIB decoding")
+    variant('grib', default='eccodes', values=('eccodes', 'grib-api'),
+            description='Specify GRIB backend')
     variant('build_type', default='RelWithDebInfo',
             description='The build type to build',
             values=('Debug', 'Release', 'RelWithDebInfo', 'Production'))
 
-    depends_on('eccodes', when='+eccodes')
-    depends_on('grib-api', when='~eccodes')
+    depends_on('eccodes', when='grib=eccodes')
+    depends_on('grib-api', when='grib=grib-api')
     depends_on('fftw+float+double')
     depends_on('cmake@2.8.11:', type='build')
+    depends_on('pkg-config', type='build')
+
+    conflicts('grib=eccodes', when='@:4.4.1',
+              msg='Eccodes is supported starting version 4.4.2')
 
     def cmake_args(self):
-        spec = self.spec
         args = []
 
-        if spec.satisfies('+eccodes'):
+        if self.spec.variants['grib'].value == 'eccodes':
             args.append('-DENABLE_ECCODES=ON')
-            args.append('-DECCODES_PATH=%s' % spec['eccodes'].prefix)
         else:
-            args.append('-DENABLE_ECCODES=OFF')
-            args.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix)
+            if self.spec.satisfies('@4.4.2:'):
+                args.append('-DENABLE_ECCODES=OFF')
 
         # To support long pathnames that spack generates
         args.append('-DCMAKE_Fortran_FLAGS=-ffree-line-length-none')
diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py
index 540abd6c1d..a3a5c49946 100644
--- a/var/spack/repos/builtin/packages/magics/package.py
+++ b/var/spack/repos/builtin/packages/magics/package.py
@@ -33,48 +33,86 @@ class Magics(CMakePackage):
 
     homepage = "https://software.ecmwf.int/wiki/display/MAGP/Magics"
     url      = "https://software.ecmwf.int/wiki/download/attachments/3473464/Magics-2.29.0-Source.tar.gz"
+    list_url = "https://software.ecmwf.int/wiki/display/MAGP/Releases"
 
-    # Maintainers of Magics do not keep tarballs of minor releases. Once the
-    # next minor released is published the previous one becomes unavailable.
-    # That is why the preferred version is the latest stable one.
+    # The policy on which minor releases remain available and which get deleted
+    # after a newer version becomes available is unclear.
+    version('2.34.3', 'b4180bc4114ffd723b80728947f50c17')
+    version('2.34.1', '1ecc5cc20cb0c3f2f0b9171626f09d53')
+    version('2.33.0', '8d513fd2244f2974b3517a8b30dd51f6')
     version('2.32.0', 'e17956fffce9ea826cf994f8d275e0f5')
+    version('2.31.0', '3564dca9e1b4af096fd631906f5e6c89')
+    version('2.29.6', '56d2c31ca75162e5e86ef75d355e87f1')
     version('2.29.4', '91c561f413316fb665b3bb563f3878d1')
-    version('2.29.0', 'db20a4d3c51a2da5657c31ae3de59709', preferred=True)
+    version('2.29.0', 'db20a4d3c51a2da5657c31ae3de59709')
 
     # The patch reorders includes and adds namespaces where necessary to
     # resolve ambiguity of invocations of isnan and isinf functions. The
     # patch is not needed since the version 2.29.1
     patch('resolve_isnan_ambiguity.patch', when='@2.29.0')
 
-    variant('bufr', default=False, description='Enable BUFR support')
+    variant('grib', default='eccodes', values=('eccodes', 'grib-api'),
+            description='Specify GRIB backend')
     variant('netcdf', default=False, description='Enable NetCDF support')
-    variant('cairo', default=True, description='Enable cairo support[png/jpeg]')
+    variant('cairo', default=False,
+            description='Enable cairo support[png/jpeg]')
+    variant('python', default=False, description='Enable Python interface')
+    variant('fortran', default=False, description='Enable Fortran interface')
     variant('metview', default=False, description='Enable metview support')
     variant('qt', default=False, description='Enable metview support with qt')
-    variant('eccodes', default=False, description='Use eccodes instead of grib-api')
+    variant('bufr', default=False, description='Enable BUFR support')
+
     variant('build_type', default='RelWithDebInfo',
             description='The build type to build',
             values=('Debug', 'Release', 'RelWithDebInfo', 'Production'))
 
+    # Build dependencies
     depends_on('cmake@2.8.11:', type='build')
     depends_on('pkg-config', type='build')
-
-    # Currently python is only necessary to run
-    # building preprocessing scripts.
-    depends_on('python', type='build')
+    depends_on('python@:2', type='build')
     depends_on('perl', type='build')
     depends_on('perl-xml-parser', type='build')
-    depends_on('eccodes', when='+eccodes')
-    depends_on('grib-api', when='~eccodes')
+
+    # Non-optional dependencies
     depends_on('proj')
     depends_on('boost')
     depends_on('expat')
-    depends_on('pango', when='+cairo')
+
+    # Magics (at least up to version 2.34.3) should directly and
+    # unconditionally depend on zlib, which is not reflected neither in the
+    # installation instructions nor explicitly stated in the cmake script:
+    # zlib is pulled as a dependency of png. The dependency on png is formally
+    # optional and depends on an unofficial flag ENABLE_PNG, which is
+    # redundant, because png is used only when ENABLE_CAIRO=ON. The problem is
+    # that files that make calls to png library get compiled and linked
+    # unconditionally, which makes png a non-optional dependency (and
+    # ENABLE_PNG always has to be set to ON).
+    depends_on('zlib')
+    depends_on('libpng')
+
+    # GRIB support is non-optional, regardless of what the instruction says.
+    depends_on('eccodes', when='grib=eccodes')
+    depends_on('grib-api', when='grib=grib-api')
+
+    # Optional dependencies
     depends_on('netcdf-cxx', when='+netcdf')
-    depends_on('libemos', when='+bufr')
+    depends_on('pango', when='+cairo')
+    depends_on('libemos grib=eccodes', when='+bufr grib=eccodes')
+    depends_on('libemos grib=grib-api', when='+bufr grib=grib-api')
     depends_on('qt', when='+metview+qt')
 
-    conflicts('+eccodes', when='@:2.29.0')
+    extends('python', when='+python')
+    # Python 2 is required for running the building scripts. Since we can't
+    # have two different versions of Python at the same time, we haven't even
+    # tested if the Python interface supports Python 3.
+    depends_on('python', when='+python', type=('link', 'run'))
+    depends_on('py-numpy', when='+python', type=('build', 'run'))
+    depends_on('swig', when='+python', type='build')
+
+    conflicts('grib=eccodes', when='@:2.29.0',
+              msg='Eccodes is supported starting version 2.29.1')
+    conflicts('+python', when='@:2.28',
+              msg='Python interface is supported starting version 2.29.0')
 
     # Replace system python and perl by spack versions:
     def patch(self):
@@ -84,50 +122,51 @@ class Magics(CMakePackage):
             filter_file('#!/usr/bin/python', '#!/usr/bin/env python', pyfile)
 
     def cmake_args(self):
-        spec = self.spec
         args = [
             '-DENABLE_ODB=OFF',
-            '-DENABLE_PYTHON=OFF',
-            '-DBOOST_ROOT=%s' % spec['boost'].prefix,
-            '-DPROJ4_PATH=%s' % spec['proj'].prefix,
-            '-DENABLE_TESTS=OFF',
+            '-DENABLE_SPOT=OFF'
         ]
 
-        if '+bufr' in spec:
-            args.append('-DENABLE_BUFR=ON')
-            args.append('-DLIBEMOS_PATH=%s' % spec['libemos'].prefix)
+        if self.spec.variants['grib'].value == 'eccodes':
+            args.append('-DENABLE_ECCODES=ON')
         else:
-            args.append('-DENABLE_BUFR=OFF')
+            if self.spec.satisfies('@2.29.1:'):
+                args.append('-DENABLE_ECCODES=OFF')
 
-        if '+netcdf' in spec:
+        if '+netcdf' in self.spec:
             args.append('-DENABLE_NETCDF=ON')
-            args.append('-DNETCDF_PATH=%s' % spec['netcdf-cxx'].prefix)
         else:
             args.append('-DENABLE_NETCDF=OFF')
 
-        if '+cairo' in spec:
+        if '+cairo' in self.spec:
             args.append('-DENABLE_CAIRO=ON')
         else:
             args.append('-DENABLE_CAIRO=OFF')
 
-        if '+metview' in spec:
-            if '+qt' in spec:
+        if '+python' in self.spec:
+            args.append('-DENABLE_PYTHON=ON')
+        else:
+            if self.spec.satisfies('@2.29.0:'):
+                args.append('-DENABLE_PYTHON=OFF')
+
+        if '+fortran' in self.spec:
+            args.append('-DENABLE_FORTRAN=ON')
+        else:
+            args.append('-DENABLE_FORTRAN=OFF')
+
+        if '+bufr' in self.spec:
+            args.append('-DENABLE_BUFR=ON')
+        else:
+            args.append('-DENABLE_BUFR=OFF')
+
+        if '+metview' in self.spec:
+            if '+qt' in self.spec:
                 args.append('-DENABLE_METVIEW=ON')
-                if spec['qt'].version[0] == 5:
+                if self.spec['qt'].satisfies('@5:'):
                     args.append('-DENABLE_QT5=ON')
             else:
                 args.append('-DENABLE_METVIEW_NO_QT=ON')
         else:
             args.append('-DENABLE_METVIEW=OFF')
 
-        if '+eccodes' in spec:
-            args.append('-DENABLE_ECCODES=ON')
-            args.append('-DECCODES_PATH=%s' % spec['eccodes'].prefix)
-        else:
-            args.append('-DENABLE_ECCODES=OFF')
-            args.append('-DGRIB_API_PATH=%s' % spec['grib-api'].prefix)
-
-        if (self.compiler.f77 is None) or (self.compiler.fc is None):
-            args.append('-DENABLE_FORTRAN=OFF')
-
         return args