X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=d5cc9f3785a80b6e5a8b4b97fe4dced5a5583e3c;hb=741865bb76b69430eae8966f56bb657bf16a5a26;hp=e99cafdd2162538b289a821457d1deb716ab9717;hpb=855e26868ff8b9e6d00ca4d69ce6c9fdc0f2e121;p=vpp.git diff --git a/Makefile b/Makefile index e99cafdd216..d5cc9f3785a 100644 --- a/Makefile +++ b/Makefile @@ -173,6 +173,13 @@ endif .PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe .PHONY: test-cov test-wipe-cov +define banner + @echo "========================================================================" + @echo " $(1)" + @echo "========================================================================" + @echo " " +endef + help: @echo "Make Targets:" @echo " install-dep - install software dependencies" @@ -191,7 +198,6 @@ help: @echo " test-debug - build and run (basic) functional tests (debug build)" @echo " test-all - build and run (all) functional tests" @echo " test-all-debug - build and run (all) functional tests (debug build)" - @echo " test-ext - build and run 'extras' functional tests" @echo " test-shell - enter shell with test environment" @echo " test-shell-debug - enter shell with test environment (debug build)" @echo " test-wipe - wipe files generated by unit tests" @@ -201,7 +207,7 @@ help: @echo " run-vat - run vpp-api-test tool" @echo " pkg-deb - build DEB packages" @echo " pkg-rpm - build RPM packages" - @echo " dpdk-install-dev - install DPDK development packages" + @echo " install-ext-deps - install external development dependencies" @echo " ctags - (re)generate ctags database" @echo " gtags - (re)generate gtags database" @echo " cscope - (re)generate cscope database" @@ -210,6 +216,9 @@ help: @echo " doxygen - (re)generate documentation" @echo " bootstrap-doxygen - setup Doxygen dependencies" @echo " wipe-doxygen - wipe all generated documentation" + @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 " test-doc - generate documentation for test framework" @echo " test-wipe-doc - wipe documentation for test framework" @echo " test-cov - generate code coverage report for test framework" @@ -286,8 +295,12 @@ endif @sudo -E apt-get update @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) else ifneq ("$(wildcard /etc/redhat-release)","") - @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) +ifeq ($(OS_ID),rhel) + @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms +else ifeq ($(OS_ID),centos) @sudo -E yum install $(CONFIRM) centos-release-scl-rh +endif + @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) @@ -300,7 +313,7 @@ else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else - $(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems") + $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems") endif define make @@ -357,19 +370,18 @@ wipe-release: test-wipe $(BR)/.deps.ok rebuild-release: wipe-release build-release -export VPP_PYTHON_PREFIX ?= $(BR)/python - libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) +export TEST_DIR ?= $(WS_ROOT)/test + define test $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,) $(eval libs:=lib lib64) make -C test \ - TEST_DIR=$(WS_ROOT)/test \ - VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \ - VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ - VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \ - VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \ + 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_INSTALL_PATH=$(BR)/install-$(2)-native/ \ LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ @@ -385,15 +397,12 @@ test-debug: $(call test,vpp,vpp_debug,test) test-all: + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install japi-install,) $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp,test) -test-ext: - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,) - $(eval EXTENDED_TESTS=yes) - $(call test,vpp,vpp_debug,test-ext) - test-all-debug: + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,) $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,test) @@ -486,7 +495,11 @@ pkg-srpm: dist make -C extras/rpm srpm dpdk-install-dev: - make -C dpdk install-$(PKG) + $(call banner,"This command is deprecated. Please use 'make install-ext-deps'") + make -C build/external install-$(PKG) + +install-ext-deps: + make -C build/external install-$(PKG) ctags: ctags.files @ctags --totals --tag-relative -L $< @@ -526,14 +539,23 @@ doxygen: wipe-doxygen: $(call make-doxy) -define banner - @echo "========================================================================" - @echo " $(1)" - @echo "========================================================================" - @echo " " -endef +# 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 docs-clean + +docs-venv: + @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh venv) + +docs: $(DOCS_DIR) + @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh html) + +docs-clean: + @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean) -verify: install-dep $(BR)/.deps.ok dpdk-install-dev +verify: install-dep $(BR)/.deps.ok install-ext-deps $(call banner,"Building for PLATFORM=vpp using gcc") @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages $(call banner,"Building sample-plugin") @@ -546,7 +568,7 @@ verify: install-dep $(BR)/.deps.ok dpdk-install-dev @make -C build-root PLATFORM=vpp TAG=vpp vom-install $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) -ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) +ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif