Docker image builds: simplify doxygen version handling.

Remove broken handling for requested versions other than 1.8.5.

Remove over-specified (and broken) doxygen argument in parser.

diff --git a/admin/containers/scripted_gmx_docker_builds.py b/admin/containers/scripted_gmx_docker_builds.py
index 2e20069386e13645c8f5e773f00ff70526170b95..022aed7a50df939f258f1151c33c6883688d45ce 100644 (file)
--- a/admin/containers/scripted_gmx_docker_builds.py
+++ b/admin/containers/scripted_gmx_docker_builds.py
@@ -407,26 +407,26 @@ def add_doxygen_stages(input_args,
     """Add appropriate stages according to doxygen input arguments."""
     if input_args.doxygen is None:
         return
-    if (input_args.doxygen == '1.8.5'):
+    if input_args.doxygen == '1.8.5':
         doxygen_commit = 'ed4ed873ab0e7f15116e2052119a6729d4589f7a'
+        output_stages['main'] += hpccm.building_blocks.generic_autotools(
+            repository='https://github.com/westes/flex.git',
+            commit='f7788a9a0ecccdc953ed12043ccb59ca25714018',
+            prefix='/tmp/install-of-flex',
+            configure_opts=['--disable-shared'],
+            preconfigure=['./autogen.sh'])
+        output_stages['main'] += hpccm.building_blocks.generic_autotools(
+            repository='https://github.com/doxygen/doxygen.git',
+            commit=doxygen_commit,
+            prefix='',
+            configure_opts=[
+                '--flex /tmp/install-of-flex/bin/flex',
+                '--static'],
+            postinstall=[
+                'sed -i \'/\"XPS\"/d;/\"PDF\"/d;/\"PS\"/d;/\"EPS\"/d;/disable ghostscript format types/d\' /etc/ImageMagick-6/policy.xml'])
+        output_stages['main'] += hpccm.building_blocks.pip(pip='pip3', packages=['sphinx==1.6.1'])
     else:
-        doxygen_commit = 'a6d4f4df45febe588c38de37641513fd576b998f'
-    output_stages['main'] += hpccm.building_blocks.generic_autotools(
-        repository='https://github.com/westes/flex.git',
-        commit='f7788a9a0ecccdc953ed12043ccb59ca25714018',
-        prefix='/tmp/install-of-flex',
-        configure_opts=['--disable-shared'],
-        preconfigure=['./autogen.sh'])
-    output_stages['main'] += hpccm.building_blocks.generic_autotools(
-        repository='https://github.com/doxygen/doxygen.git',
-        commit=doxygen_commit,
-        prefix='',
-        configure_opts=[
-            '--flex /tmp/install-of-flex/bin/flex',
-            '--static'],
-        postinstall=[
-            'sed -i \'/\"XPS\"/d;/\"PDF\"/d;/\"PS\"/d;/\"EPS\"/d;/disable ghostscript format types/d\' /etc/ImageMagick-6/policy.xml'])
-    output_stages['main'] += hpccm.building_blocks.pip(pip='pip3', packages=['sphinx==1.6.1'])
+        raise RuntimeError('Unhandled doxygen version: {}'.format(input_args.doxygen))
 
 
 def build_stages(args) -> typing.Iterable[hpccm.Stage]:

diff --git a/admin/containers/utility.py b/admin/containers/utility.py
index b94af8f851f47026ef91396f0bfa5b08d1323911..73e6a85e2eebcb58478be781bc388b3b6f69f2a4 100644 (file)
--- a/admin/containers/utility.py
+++ b/admin/containers/utility.py
@@ -104,5 +104,4 @@ parser.add_argument('--clfft', type=str, nargs='?', const='master', default=None
                     help='Add external clFFT libraries to the build image')
 
 parser.add_argument('--doxygen', type=str, nargs='?', const='1.8.5', default=None,
-                    choices=['1.8.5', '1.8.11'],
                     help='Add doxygen environment for documentation builds. Also adds other requirements needed for final docs images.')