commit 484843f16ca47d2ee9e0fe2cdb4da1c3fc102a4b
author Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Wed Nov 30 14:39:45 2022 +0000
committer Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> Thu Dec 01 13:40:58 2022 +0000
tree 523894b88af1d85775511804fe35c5e8db4df6bf
parent d10ffc96a911510a1250f4ff279354d41d0ade2a

fix(docs): docs build in aarch64 fails

docs build in aarch64 fails as PythonModules.cmake is not compatible
with cmake version 3.16.3. Checking for the presence of python modules
is not required as the python modules found are not directly used by
the cmake rule.

This fix also removes FindPlantUML. Dependency on PlantUML was removed
as part of commit f1a13aa.

Git release tag will be in format tf-rmm-<version>. Add tf-rmm- prefix
in docs/conf.py

Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: Ife9dc13205abb145c723354cc5843cfd436bf5ef

docs/CMakeLists.txt

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 0e3f1a6..1da7997 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -9,12 +9,11 @@
 
 find_package(Python3)
 find_package(Sphinx)
-find_package(PythonModules COMPONENTS sphinx-rtd-theme sphinxcontrib.plantuml)
 find_package(Git)
 
 set(SPHINXCFG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/user_guide)
 
-if (SPHINX_FOUND AND PY_SPHINX-RTD-THEME_FOUND AND PY_SPHINXCONTRIB.PLANTUML AND GIT_FOUND)
+if (SPHINX_FOUND AND GIT_FOUND)
 
     file(GLOB_RECURSE SPHINXCFG_DOC_FILES ${CMAKE_CURRENT_SOURCE_DIR} *.rst conf.py)
 

docs/conf.py

diff --git a/docs/conf.py b/docs/conf.py
index b865e5b..f34fa81 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@
 title = 'User Guide'
 
 try:
-  vregx = re.compile(r'(?P<RMM_VERSION>v.+?)'
+  vregx = re.compile(r'tf-rmm-(?P<RMM_VERSION>v.+?)'
                      r'(-[0-9]+-)?(?P<GIT_SHA>g[a-f0-9]{7,})?$')
   git_result = check_output("git describe --tags --always",
                             shell = True, encoding = 'UTF-8')