nat: use correct data types for memory sizes

[vpp.git] / doxygen / Makefile

diff --git a/doxygen/Makefile b/doxygen/Makefile
index 92fa363..4064614 100644 (file)
--- a/doxygen/Makefile
+++ b/doxygen/Makefile
@@ -33,8 +33,9 @@ endif
 OS_ID ?= $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 
 # Package dependencies
-DOC_DEB_DEPENDS = doxygen graphviz python-pyparsing python-jinja2
-DOC_RPM_DEPENDS = doxygen graphviz pyparsing python-jinja2
+DOC_DEB_DEPENDS = doxygen graphviz python3-pyparsing python3-jinja2
+DOC_RPM_DEPENDS = doxygen graphviz python3-pyparsing python3-jinja2
+DOC_SUSE_RPM_DEPENDS = doxygen graphviz python3-pyparsing python3-Jinja2
 DOC_MAC_BIN_DEPENDS = doxygen dot git
 DOC_MAC_PY_DEPENDS = pyparsing jinja2
 
@@ -42,21 +43,27 @@ DOC_MAC_PY_DEPENDS = pyparsing jinja2
 DOXY_DIR ?= $(WS_ROOT)/doxygen
 
 # Primary source directories
+DOXY_SRC ?= $(WS_ROOT)/src
 DOXY_SRC_DIRECTORIES = \
-       vppinfra \
-       svm \
-       vlib \
-       vlib-api \
-       vnet \
-       vpp \
-       vpp-api
+       $(shell find $(DOXY_SRC) -name '*.md' -print | xargs dirname \
+       | sort | uniq) \
+       $(DOXY_SRC)/vppinfra \
+       $(DOXY_SRC)/svm \
+       $(DOXY_SRC)/vlib \
+       $(DOXY_SRC)/vlibapi \
+       $(DOXY_SRC)/vlibmemory \
+       $(DOXY_SRC)/vnet \
+       $(DOXY_SRC)/vpp \
+       $(DOXY_SRC)/vpp-api \
+       $(DOXY_SRC)/examples
 
 # Input directories and files
 DOXY_INPUT ?= \
        $(wildcard $(WS_ROOT)/*.md) \
        $(wildcard $(DOXY_DIR)/*.md) \
        $(DOXY_SRC_DIRECTORIES) \
-       plugins
+       $(DOXY_SRC)/plugins \
+       extras
 
 # Strip leading workspace path from input names
 DOXY_INPUT := $(subst $(WS_ROOT)/,,$(DOXY_INPUT))
@@ -67,9 +74,7 @@ DOXY_INPUT := $(subst $(WS_ROOT)/,,$(DOXY_INPUT))
 # there's a DPDK equivalent that conflicts.
 # These must be left-anchored paths for the regexp below to work.
 DOXY_EXCLUDE ?= \
-       vlib/vlib/buffer.c \
-       vlib/example \
-       plugins/sample-plugin
+       $(DOXY_SRC)/vpp-api/lua
 
 # Generate a regexp for filenames to exclude
 DOXY_EXCLUDE_REGEXP = ($(subst .,\.,$(shell echo '$(strip $(DOXY_EXCLUDE))' | sed -e 's/ /|/g')))
@@ -77,10 +82,6 @@ DOXY_EXCLUDE_REGEXP = ($(subst .,\.,$(shell echo '$(strip $(DOXY_EXCLUDE))' | se
 # Include all the normal source directories in the include file path
 DOXY_INCLUDE_PATH = $(DOXY_SRC_DIRECTORIES)
 
-# Also include any plugin directories that exist
-DOXY_INCLUDE_PATH += \
-       $(shell find $(WS_ROOT)/plugins -maxdepth 1 -type d | sed -e 's@^$(WS_ROOT)/*@@')
-
 # Find API header directories and include them in the header path.
 # This is only useful if VPP and plugins are already built; nothing
 # here depends on those targets. We don't build documentation for these
@@ -135,7 +136,7 @@ ifeq ($(OS_ID),ubuntu)
                        sudo apt-get $(CONFIRM) $(FORCE) install $$inst; \
                fi
        @if [ ! -s /usr/lib/graphviz/config6a ]; then \
-               echo "Rebuidlding system Graphviz configuration."; \
+               echo "Rebuilding system Graphviz configuration."; \
                sudo dot -c; \
        fi
 else ifneq ("$(wildcard /etc/redhat-release)","")
@@ -155,8 +156,10 @@ else ifeq ($(OS_ID),darwin)
                        false; \
                ); \
        done
+else ifeq ($(OS_ID),opensuse)
+       @sudo zypper install $(CONFIRM) $(DOC_SUSE_RPM_DEPENDS)
 else
-       $(error "Building documentation currently works only on Ubuntu, CentOS or MacOS systems.")
+       $(error "Building documentation currently works only on Ubuntu, CentOS, MacOS and OpenSUSE systems.")
 endif
        @touch $@
 
@@ -164,9 +167,11 @@ endif
 bootstrap-doxygen: $(BR)/.doxygen-bootstrap.ok
 
 .DELETE_ON_ERROR: $(BR)/.doxygen-siphon.dep
-$(BR)/.doxygen-siphon.dep: Makefile
+$(BR)/.doxygen-siphon.dep: Makefile \
+               $(addprefix,$(WSROOT),$(DOXY_INPUT))
        @echo "Building siphon dependencies..."
-       @set -e; rm -f "$@"; for input in $(DOXY_INPUT); do \
+       @rm -f "$@"; for input in $(DOXY_INPUT); do \
+               [ -e "$(WS_ROOT)/$$input" ] && \
                find "$(WS_ROOT)/$$input" -type f \
                        \( -name '*.[ch]' -or -name '*.dox' \) -print \
                        | grep -v -E '^$(WS_ROOT)/$(DOXY_EXCLUDE_REGEXP)' \
@@ -182,7 +187,15 @@ $(BR)/.doxygen-siphon.dep: Makefile
 .NOTPARALLEL: $(SIPHON_FILES)
 $(SIPHON_FILES): $(BR)/.doxygen-bootstrap.ok \
                $(DOXY_DIR)/siphon-generate \
+               $(addprefix,$(WSROOT),$(DOXY_INPUT)) \
                $(wildcard $(DOXY_DIR)/siphon/*.py)
+       @echo "Validating source tree..."
+       @set -e; for input in $(DOXY_INPUT); do \
+               if [ ! -e "$(WS_ROOT)/$$input" ]; then \
+                       echo "ERROR: Input path '$$input' does not exist." >&2; \
+                       exit 1; \
+               fi; \
+       done
        @rm -rf "$(SIPHON_INPUT)" "$(SIPHON_OUTPUT)"
        @mkdir -p "$(SIPHON_INPUT)" "$(SIPHON_OUTPUT)"
        @touch $(SIPHON_INPUT)/files
@@ -191,6 +204,7 @@ $(SIPHON_FILES): $(BR)/.doxygen-bootstrap.ok \
                cd "$(WS_ROOT)"; \
                find "$$input" -type f \
                        \( -name '*.[ch]' -or -name '*.dox' \) -print \
+                       | grep -v -E '^src/examples/' \
                        | grep -v -E '^$(DOXY_EXCLUDE_REGEXP)' \
                        >> $(SIPHON_INPUT)/files; \
        done
@@ -250,7 +264,10 @@ doxygen: $(SIPHON_DOCS)
 
 .PHONY: wipe-doxygen
 wipe-doxygen:
-       rm -rf "$(BR)/docs" "$(BR)/.doxygen-siphon.d"
+       @rm -rf $(BR)/docs
+       @rm -rf $(BR)/.doxygen-siphon.dep
+       @rm -rf $(BR)/.doxygen-bootstrap.ok
+       @rm -rf $(DOXY_DIR)/siphon/__pycache__
 
 .PHONY: clean
 clean: wipe-doxygen