Add make target "docs" to create current branch
We've been seeing issues with sphinx-multiversion not building the
docs with the imported repos. sphinx-build still works as expected,
and we don't have a very strong need for multiversion builds.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: Iab726bb365970a58746204980b21d595232204ba
diff --git a/Makefile b/Makefile
index cb8ee1b..eed77bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# -*- makefile -*-
# -----------------------------------------------------------------------
-# Copyright 2022-2024 Open Networking Foundation Contributors
+# Copyright 2022-2025 Open Networking Foundation Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2022-2024 Open Networking Foundation Contributors
+# SPDX-FileCopyrightText: 2022-2025 Open Networking Foundation Contributors
# SPDX-License-Identifier: Apache-2.0
# -----------------------------------------------------------------------
# Intent: Makefile for Sphinx documentation
@@ -25,9 +25,6 @@
endif
MAKECMDGOALS ?= help
-$(if $(findstring disabled-joey,$(USER)),\
- $(eval USE_LF_MK := 1)) # special snowflake
-
##--------------------##
##---] INCLUDES [---##
##--------------------##
@@ -43,6 +40,7 @@
SPHINXBUILD ?= sphinx-build
SOURCEDIR ?= .
BUILDDIR ?= _build
+BRANCH ?= $(shell git branch --show-current)
# Other repos with documentation to include.
# edit the `git_refs` file with the commit/tag/branch that you want to use
@@ -170,6 +168,15 @@
# cp -r cord-tester/gendocs/* $@
## -----------------------------------------------------------------------
+## Intent: Build docs for the current branch
+## -----------------------------------------------------------------------
+docs: $(venv-activate-script) Makefile | prep $(OTHER_REPO_DOCS)
+ $(activate) && sphinx-build "$(SOURCEDIR)" "$(BUILDDIR)/$(BRANCH)" $(SPHINXOPTS)
+ifeq ($(BRANCH),master)
+ cp "$(SOURCEDIR)/_templates/meta_refresh.html" "$(BUILDDIR)/index.html"
+endif
+
+## -----------------------------------------------------------------------
## Intent: generate a list of git checksums suitable for updating git_refs
## -----------------------------------------------------------------------
freeze: repos
@@ -195,18 +202,6 @@
prep: | $(OTHER_REPO_DOCS) $(STATIC_DOCS)
## -----------------------------------------------------------------------
-## Intent: Forward sphinx supported targets to sphinxbuild.
-## Bridge: legacy makefile wildcard rule forwarded unknown targets to sphinx.
-## library makefiles do more so transfer control only when needed.
-## -----------------------------------------------------------------------
-include $(ONF_MAKEDIR)/voltha/docs-catchall-targets.mk
-voltha-docs-catchall : $(voltha-docs-catchall)
-$(voltha-docs-catchall): $(venv-activate-script) Makefile | $(OTHER_REPO_DOCS) $(STATIC_DOCS)
- @echo " ** CATCHALL: $@"
- $(activate)\
- && $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-## -----------------------------------------------------------------------
## Intent: Display makefile target help
## -----------------------------------------------------------------------
help-targets-sphinx : $(venv-activate-script)
diff --git a/VERSION b/VERSION
index 94f15e9..0e83a9a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.1
+2.13.2
diff --git a/sphinx_conf/exclude_patterns.py b/sphinx_conf/exclude_patterns.py
index 3c5fade..3bdeafe 100644
--- a/sphinx_conf/exclude_patterns.py
+++ b/sphinx_conf/exclude_patterns.py
@@ -20,6 +20,9 @@
'cord-tester/src',
'cord-tester/README.md',
'cord-tester/cord-robot/README.rst',
+ 'lf',
+ 'makesfiles',
+ 'makefiles-orig',
'openolt/agent/*',
'repos',
'requirements.txt',