diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-01-10 10:39:21 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-01-10 09:40:45 +0000 |
| commit | 6bbf83a01b813b3d50b27ab9001d25cae5c4592a (patch) | |
| tree | 0d7c64c55966b1f32ad166768aa5eedff7fbe4fb /doxygen | |
| parent | 842b9c59cc21b3e2917aaa25069fb15addf976f1 (diff) | |
Revert "vppctl: bash completion for vppctl commands"
This patch is causing build failures
This reverts commit d995c757f05f78aa759b0a65c0a7e38088e690a9.
Change-Id: I0c8d5a4208135d77aaa3a6a470d26140f7b74733
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'doxygen')
| -rw-r--r-- | doxygen/Makefile | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/doxygen/Makefile b/doxygen/Makefile index 18086626e1c..face5b44828 100644 --- a/doxygen/Makefile +++ b/doxygen/Makefile @@ -33,6 +33,8 @@ 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_MAC_BIN_DEPENDS = doxygen dot git DOC_MAC_PY_DEPENDS = pyparsing jinja2 @@ -127,11 +129,22 @@ SIPHON_DOCS = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .md,$(SIPHONS))) SIPHON_ITEMLIST = $(addprefix $(SIPHON_OUTPUT)/,$(addsuffix .itemlist,$(filter clicmd,$(SIPHONS)))) $(BR)/.doxygen-bootstrap.ok: Makefile + @echo "Checking whether dependencies for Doxygen are installed..." ifeq ($(OS_ID),ubuntu) + @set -e; inst=; \ + for i in $(DOC_DEB_DEPENDS); do \ + dpkg-query --show $$i >/dev/null 2>&1 || inst="$$inst $$i"; \ + done; \ + if [ "$$inst" ]; then \ + sudo apt-get update; \ + sudo apt-get $(CONFIRM) $(FORCE) install $$inst; \ + fi @if [ ! -s /usr/lib/graphviz/config6a ]; then \ - echo "Rebuilding system Graphviz configuration."; \ + echo "Rebuidlding system Graphviz configuration."; \ sudo dot -c; \ fi +else ifneq ("$(wildcard /etc/redhat-release)","") + @sudo yum install $(CONFIRM) $(DOC_RPM_DEPENDS) else ifeq ($(OS_ID),darwin) @set -e; \ for bin in $(DOC_MAC_BIN_DEPENDS); do \ @@ -174,7 +187,8 @@ $(BR)/.doxygen-siphon.dep: Makefile \ # Generate .siphon files that contain fragments of source file that # relate to the siphons we support. .NOTPARALLEL: $(SIPHON_FILES) -$(SIPHON_FILES):$(DOXY_DIR)/siphon-generate \ +$(SIPHON_FILES): $(BR)/.doxygen-bootstrap.ok \ + $(DOXY_DIR)/siphon-generate \ $(addprefix,$(WSROOT),$(DOXY_INPUT)) \ $(wildcard $(DOXY_DIR)/siphon/*.py) @echo "Validating source tree..." @@ -232,12 +246,7 @@ $(eval $(call siphon-process,itemlist,itemlist)) # This target can be used just to generate the siphoned things .PHONY: doxygen-siphon -doxygen-siphon: $(SIPHON_DOCS) - -# This target is used generate list of cli commands for use with -# the bash completion element for vppctl -.PHONY: doxygen-siphon-list -doxygen-siphon-list: $(SIPHON_ITEMLIST) +doxygen-siphon: $(SIPHON_DOCS) $(SIPHON_ITEMLIST) # Generate the doxygen docs .PHONY: doxygen |