X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=1456ef2b720fb2d161a585c5a1a4c3a1ee47549e;hb=ea25722b3855926f74c33270cbf822ab30ae8ce6;hp=b57ed5c06e8a1d11a0395cb607fa071b6f8464f3;hpb=bfcd4b9868112226705571dadad68aa160f6896e;p=vpp.git diff --git a/Makefile b/Makefile index b57ed5c06e8..1456ef2b720 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ endif # +libganglia1-dev if building the gmond plugin DEB_DEPENDS = curl build-essential autoconf automake ccache -DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd dh-python +DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf libnuma-dev DEB_DEPENDS += python3-all python3-setuptools check @@ -131,7 +131,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) RPM_DEPENDS += compat-openssl10 openssl-devel RPM_DEPENDS += python2-devel python36-devel python3-ply RPM_DEPENDS += python3-virtualenv python3-jsonschema - RPM_DEPENDS += cmake + RPM_DEPENDS += libarchive cmake RPM_DEPENDS_GROUPS = 'Development Tools' else RPM_DEPENDS += yum-utils @@ -209,9 +209,9 @@ help: @echo " checkstyle-test-diff - check test framework coding style (only changed files)" @echo " checkstyle-api - check api for incompatible changes" @echo " fixstyle - fix coding style" - @echo " doxygen - (re)generate documentation" - @echo " bootstrap-doxygen - setup Doxygen dependencies" - @echo " wipe-doxygen - wipe all generated documentation" + @echo " doxygen - DEPRECATED - use 'make docs'" + @echo " bootstrap-doxygen - DEPRECATED" + @echo " wipe-doxygen - DEPRECATED" @echo " checkfeaturelist - check FEATURE.yaml according to schema" @echo " featurelist - dump feature list in markdown" @echo " json-api-files - (re)-generate json api files" @@ -220,7 +220,6 @@ help: @echo " docs - Build the Sphinx documentation" @echo " docs-venv - Build the virtual environment for the Sphinx docs" @echo " docs-clean - Remove the generated files from the Sphinx docs" - @echo " stats-fs-help - Help to build the stats segment file system" @echo "" @echo "Make Arguments:" @echo " V=[0|1] - set build verbosity level" @@ -296,7 +295,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) @sudo -E dnf config-manager --set-enabled \ $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1) @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) - @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) + @sudo -E dnf install --skip-broken $(CONFIRM) $(RPM_DEPENDS) else ifeq ($(OS_ID),centos) @sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @@ -362,7 +361,7 @@ wipedist: .PHONY: wipe wipe: wipedist test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS))) - @find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \; + @find . -type f -name "*.api.json" ! -path "./src/*" -exec rm {} \; .PHONY: rebuild rebuild: wipe build @@ -378,8 +377,6 @@ wipe-release: test-wipe $(BR)/.deps.ok .PHONY: rebuild-release rebuild-release: wipe-release build-release -libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) - export TEST_DIR ?= $(WS_ROOT)/test export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())') @@ -389,10 +386,7 @@ define test make -C test \ VPP_BUILD_DIR=$(BR)/build-$(2)-native \ VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ - VPP_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \ - VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_api_test_plugins) \ VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \ - LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ OS_ID=$(OS_ID) \ @@ -457,11 +451,13 @@ test-dep: .PHONY: test-doc test-doc: - @make -C test doc + @echo "make test-doc is DEPRECATED: use 'make doc'" + sleep 300 .PHONY: test-wipe-doc test-wipe-doc: - @make -C test wipe-doc + @echo "make test-wipe-doc is DEPRECATED" + sleep 300 .PHONY: test-cov test-cov: @@ -669,73 +665,32 @@ featurelist: centos-pyyaml checkfeaturelist: centos-pyyaml @extras/scripts/fts.py --validate --all - -# Build vpp_stats_fs - -.PHONY: stats-fs-install -stats-fs-install: - @extras/vpp_stats_fs/install.sh install - -.PHONY: stats-fs-start -stats-fs-start: - @extras/vpp_stats_fs/install.sh start - -.PHONY: stats-fs-cleanup -stats-fs-cleanup: - @extras/vpp_stats_fs/install.sh cleanup - -.PHONY: stats-fs-help -stats-fs-help: - @extras/vpp_stats_fs/install.sh help - -.PHONY: stats-fs-force-unmount -stats-fs-force-unmount: - @extras/vpp_stats_fs/install.sh unmount - -.PHONY: stats-fs-stop -stats-fs-stop: - @extras/vpp_stats_fs/install.sh stop - # # Build the documentation # -# Doxygen configuration and our utility scripts -export DOXY_DIR ?= $(WS_ROOT)/doxygen - -define make-doxy - @OS_ID="$(OS_ID)" make -C $(DOXY_DIR) $@ -endef - .PHONY: bootstrap-doxygen bootstrap-doxygen: - $(call make-doxy) + @echo "make bootstrap-doxygen is DEPRECATED" + sleep 300 .PHONY: doxygen -doxygen: bootstrap-doxygen - $(call make-doxy) +doxygen: docs + @echo "make doxygen is DEPRECATED: use 'make docs'" + sleep 300 .PHONY: wipe-doxygen wipe-doxygen: - $(call make-doxy) + @echo "make wipe-doxygen is DEPRECATED" + sleep 300 -# Sphinx Documents -export DOCS_DIR = $(WS_ROOT)/docs -export VENV_DIR = $(WS_ROOT)/sphinx_venv -export SPHINX_SCRIPTS_DIR = $(WS_ROOT)/docs/scripts - -.PHONY: docs-venv -docs-venv: - @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv) +.PHONY: docs-% +docs-%: + @make -C $(WS_ROOT)/docs $* .PHONY: docs -docs: $(DOCS_DIR) - @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html) - -.PHONY: docs-clean -docs-clean: - @rm -rf $(DOCS_DIR)/_build - @rm -rf $(VENV_DIR) +docs: + @make -C $(WS_ROOT)/docs docs .PHONY: pkg-verify pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps