Fix multiversion builds
This includes:
* Revert switch to onf-make: onf-make was never compatible with
this repo. For now, we want to revert these changes so that the
build can work properly again.
* Re-enable static builds: the latest updates don't require removing
patching from voltha-system-tests or cord-tester to work. The build
also succeeds if patching is removed, so that is a likely future
change to those repos.
* Switch to an updated custom version of sphinx-multiversion: though
originally forked from zdw for the purpose of making changes to the
prep step or other functionality, none was necessary. However, the
latest changes to the mainline sphinx-multiversion have now been
brought into the fork, with zdw's prep additions included.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I0afb08030edcae4d2e968c63ef5eb11e17085d8a
diff --git a/Makefile b/Makefile
index 447e858..fd90308 100644
--- a/Makefile
+++ b/Makefile
@@ -28,12 +28,7 @@
##--------------------##
##---] INCLUDES [---##
##--------------------##
-ifdef USE_LF_MK
- include lf/include.mk
-else
- venv-name ?= .venv
- include lf/transition.mk
-endif # ifdef USE_LF_MK
+include makefiles/include.mk
# You can set these variables from the command line.
SPHINXOPTS ?=
@@ -51,8 +46,7 @@
# Other repos with documentation to include.
# edit the `git_refs` file with the commit/tag/branch that you want to use
-OTHER_REPO_DOCS ?= bbsim ofagent-go openolt voltctl voltha-openolt-adapter voltha-openonu-adapter-go voltha-protos device-management-interface voltha-helm-charts
-# Temporarily disabled: cord-tester voltha-system-tests
+OTHER_REPO_DOCS ?= bbsim ofagent-go openolt voltctl voltha-openolt-adapter voltha-openonu-adapter-go voltha-protos device-management-interface voltha-helm-charts voltha-system-tests cord-tester
ifdef NO_OTHER_REPO_DOCS
# Inhibit pulling in external repos.
@@ -61,7 +55,7 @@
endif
# Static docs, built by other means (usually robot framework)
-# STATIC_DOCS := _static/voltha-system-tests _static/cord-tester
+STATIC_DOCS := _static/voltha-system-tests _static/cord-tester
# Why is existing source Makefile PHONY (?)
.PHONY: help test lint reload Makefile prep
@@ -162,17 +156,17 @@
GIT_SUBDIR=`grep '^$@ ' git_refs | awk '{print $$2}'` ;\
cp -r repos/$(@)$$GIT_SUBDIR $@ ;\
-# # Build Robot documentation in voltha-system-tests and copy it into _static.
-# _static/voltha-system-tests: | $(OTHER_REPO_DOCS)
-# make -C voltha-system-tests gendocs
-# mkdir -p $@
-# cp -r voltha-system-tests/gendocs/* $@
-#
-# # Build Robot documentation in cord-tester and copy it into _static.
-# _static/cord-tester: | $(OTHER_REPO_DOCS)
-# make -C cord-tester gendocs
-# mkdir -p $@
-# cp -r cord-tester/gendocs/* $@
+# Build Robot documentation in voltha-system-tests and copy it into _static.
+_static/voltha-system-tests: | $(OTHER_REPO_DOCS)
+ make -C voltha-system-tests gendocs
+ mkdir -p $@
+ cp -r voltha-system-tests/gendocs/* $@
+
+# Build Robot documentation in cord-tester and copy it into _static.
+_static/cord-tester: | $(OTHER_REPO_DOCS)
+ make -C cord-tester gendocs
+ mkdir -p $@
+ cp -r cord-tester/gendocs/* $@
## -----------------------------------------------------------------------
## Intent: Build docs for the current branch
@@ -280,16 +274,8 @@
'Display WARNING strings buried in sphinx output'
## -----------------------------------------------------------------------
-## Intent: Checkout external repository dependencies
-## -----------------------------------------------------------------------
-init :: git-submodules
-
-git-submodules:
- git submodule update --init --recursive
-
-## -----------------------------------------------------------------------
## Intent: Display make help footer
## -----------------------------------------------------------------------
-include $(ONF_MAKEDIR)/help/trailer.mk
+include makefiles-orig/help/trailer.mk
# [EOF]
diff --git a/VERSION b/VERSION
index a1a4224..8bbab56 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.3
+2.13.5
diff --git a/conf.py b/conf.py
index 13415f7..009f01c 100644
--- a/conf.py
+++ b/conf.py
@@ -60,7 +60,7 @@
project = "VOLTHA Docs"
copyright = (
- "Copyright 2019-2024 Open Networking Foundation Contributors"
+ "Copyright 2019-2025 Open Networking Foundation Contributors"
)
author = "VOLTHA Contributors"
@@ -147,7 +147,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = None
diff --git a/makefiles-orig/include.mk b/makefiles-orig/include.mk
index c400f4b..7b983c1 100644
--- a/makefiles-orig/include.mk
+++ b/makefiles-orig/include.mk
@@ -41,7 +41,7 @@
include $(ONF_MAKEDIR)/etc/include.mk # banner macros
include $(ONF_MAKEDIR)/commands/include.mk # Tools and local installers
-# include $(ONF_MAKEDIR)/virtualenv.mk# # lint-{jjb,python} depends on venv
+include $(ONF_MAKEDIR)/virtualenv.mk# # lint-{jjb,python} depends on venv
include $(ONF_MAKEDIR)/patches/include.mk# # Patch when python 3.10+ in use
include $(ONF_MAKEDIR)/lint/include.mk
diff --git a/makefiles/include.mk b/makefiles/include.mk
index 4360b73..44872b4 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -60,7 +60,7 @@
## 1) Library constants and logic loaded first
## 2) Parameterize and augment targets from local (repo specific)
## -----------------------------------------------------------------------
-include $(lf-sbx-root)/lf/config.mk # include $(onf-mk-top)/makefiles/config.mk
+include $(onf-mk-top)/makefiles/config.mk
include $(onf-mk-lib)/include.mk
include $(onf-mk-loc)/include.mk
diff --git a/requirements.txt b/requirements.txt
index 5838cbc..83356ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,7 @@
recommonmark~=0.7.1
doc8~=1.1.2
docutils~=0.21.2
-sphinx-multiversion~=0.2.4
+git+https://github.com/eb-oss/sphinx-multiversion@main
sphinx-reload~=0.2.0
sphinx-rtd-theme~=3.0.2
sphinxcontrib-openapi~=0.8.4