X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=9868d9ae0d3c8f91462494711062deb641f743a8;hb=fc7344f;hp=a9bea9d254c02f690f647122d63dfb66ca324fd7;hpb=4a6cb83d334e391f85332ea38a2e467ac7743e4b;p=vpp.git diff --git a/Makefile b/Makefile index a9bea9d254c..9868d9ae0d3 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev -DEB_DEPENDS += cmake ninja-build +DEB_DEPENDS += cmake ninja-build uuid-dev ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev @@ -82,33 +82,31 @@ else DEB_DEPENDS += libssl-dev endif -RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils +RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel -RPM_DEPENDS += cmake3 ninja-build +RPM_DEPENDS += ninja-build +RPM_DEPENDS += libuuid-devel -ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) - RPM_DEPENDS += subunit subunit-devel - RPM_DEPENDS += openssl-devel - RPM_DEPENDS += python-devel python2-ply - RPM_DEPENDS += python2-virtualenv - RPM_DEPENDS += mbedtls-devel - RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' -else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0) +ifeq ($(OS_ID),fedora) + RPM_DEPENDS += dnf-utils RPM_DEPENDS += subunit subunit-devel RPM_DEPENDS += compat-openssl10-devel RPM_DEPENDS += python2-devel python2-ply RPM_DEPENDS += python2-virtualenv RPM_DEPENDS += mbedtls-devel + RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else + RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel RPM_DEPENDS += python-devel python-ply RPM_DEPENDS += python-virtualenv RPM_DEPENDS += devtoolset-7 + RPM_DEPENDS += cmake3 RPM_DEPENDS_GROUPS = 'Development Tools' endif @@ -122,7 +120,7 @@ RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python-ply RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel -RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel +RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros @@ -198,7 +196,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" @@ -217,6 +214,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" @@ -293,10 +293,18 @@ 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 + @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 ($(OS_ID),fedora) + @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) + @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib +endif else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) @@ -307,7 +315,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 @@ -353,6 +361,7 @@ wipedist: wipe: wipedist test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS))) + @find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \; rebuild: wipe build @@ -364,19 +373,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) \ @@ -392,15 +400,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) @@ -493,7 +498,7 @@ pkg-srpm: dist make -C extras/rpm srpm dpdk-install-dev: - $(call banner,"This command is deprecated. Please use 'make install-ext-libs'") + $(call banner,"This command is deprecated. Please use 'make install-ext-deps'") make -C build/external install-$(PKG) install-ext-deps: @@ -537,6 +542,22 @@ doxygen: wipe-doxygen: $(call make-doxy) +# 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 install-ext-deps $(call banner,"Building for PLATFORM=vpp using gcc") @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages @@ -550,7 +571,7 @@ verify: install-dep $(BR)/.deps.ok install-ext-deps @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