Use label to select doxygen version

Cherry-picked from commit 67837955db4b8c8553efdb8887a589e77e934cfb.
Allows retiring support for the old mechanisms in releng earlier.

Change-Id: Ic5276e846867e1dd77250500dcb8693946258e0c

diff --git a/admin/builds/documentation.py b/admin/builds/documentation.py
index 7ad7ecb3d3ebc3af3be658b93f9bf0c8ab75c94f..386f26eeaa4d61509043d6f2f3d1c30ccb62fde0 100644 (file)
--- a/admin/builds/documentation.py
+++ b/admin/builds/documentation.py
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2015,2016,2017,2018, by the GROMACS development team, led by
+# Copyright (c) 2015,2016,2017,2018,2019, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -35,6 +35,7 @@
 import os
 import re
 
+build_options = ['doxygen-1.8.5']
 build_out_of_source = True
 
 extra_options = {
@@ -57,9 +58,8 @@ def do_build(context):
         cmake_opts['GMX_BUILD_TARBALL'] = 'ON'
     elif context.job_type == JobType.GERRIT:
         cmake_opts['GMX_COMPACT_DOXYGEN'] = 'ON'
-    cmake_opts.update(context.get_doc_cmake_options(
-        doxygen_version='1.8.5', sphinx_version='1.6.1'))
-    context.run_cmake(cmake_opts);
+    cmake_opts['DOXYGEN_EXECUTABLE'] = context.env.doxygen_command
+    context.run_cmake(cmake_opts)
 
     # we keep the individual build targets here to ensure some
     # granularity of the resulting error messages (if any).