X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=cca853417b69b336cd0807efa5ecdd839078c1c9;hb=983ebaa3ee58f93729ad96d6af24e93784ae43d8;hp=015db5294319a4a06530dfc7ae7866c0f55a3a62;hpb=593635d4fa97ec8c26b0d2a9c9ccc17007354136;p=vpp.git diff --git a/Makefile b/Makefile index 015db529431..cca853417b6 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ SAMPLE_PLUGIN?=no STARTUP_DIR?=$(PWD) MACHINE=$(shell uname -m) SUDO?=sudo +DPDK_CONFIG?=no-pci ,:=, define disable_plugins @@ -64,25 +65,22 @@ DEB_DEPENDS = curl build-essential autoconf automake ccache DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd 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 += python-all python3-all python3-setuptools python-dev +DEB_DEPENDS += python-virtualenv python-pip libffi6 check DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev -DEB_DEPENDS += cmake ninja-build uuid-dev +DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema ifeq ($(OS_VERSION_ID),14.04) - DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) - DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev APT_ARGS = -t jessie-backports else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9) - DEB_DEPENDS += default-jdk-headless DEB_DEPENDS += libssl1.0-dev else - DEB_DEPENDS += default-jdk-headless DEB_DEPENDS += libssl-dev endif -RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel +RPM_DEPENDS = redhat-lsb glibc-static RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel @@ -90,21 +88,22 @@ RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build RPM_DEPENDS += libuuid-devel +RPM_DEPENDS += mbedtls-devel ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils RPM_DEPENDS += subunit subunit-devel RPM_DEPENDS += compat-openssl10-devel - RPM_DEPENDS += python2-devel python34-ply - RPM_DEPENDS += python2-virtualenv - RPM_DEPENDS += mbedtls-devel + RPM_DEPENDS += python3-devel python3-ply + RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel - RPM_DEPENDS += python-devel python34-ply - RPM_DEPENDS += python-virtualenv + RPM_DEPENDS += python-devel python36-ply + RPM_DEPENDS += python3-devel python3-pip + RPM_DEPENDS += python-virtualenv python36-jsonschema RPM_DEPENDS += devtoolset-7 RPM_DEPENDS += cmake3 RPM_DEPENDS_GROUPS = 'Development Tools' @@ -113,13 +112,13 @@ endif # +ganglia-devel if building the ganglia plugin RPM_DEPENDS += chrpath libffi-devel rpm-build - -SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) +# lowercase- replace spaces with dashes. +SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | sed -e 's/ /-/' | awk '{print tolower($$0)}') SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply -RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel +RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-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 @@ -128,12 +127,12 @@ RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build ifeq ($(OS_ID),opensuse) -ifeq ($(SUSE_NAME),Tumbleweed) +ifeq ($(SUSE_NAME),tumbleweed) RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc6 + RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv else RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6 @@ -143,7 +142,7 @@ endif ifeq ($(OS_ID),opensuse-leap) ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_DEVEL_DEPS += libboost_headers-devel libboost_thread-devel gcc git curl RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif endif @@ -180,49 +179,57 @@ endef help: @echo "Make Targets:" - @echo " install-dep - install software dependencies" - @echo " wipe - wipe all products of debug build " - @echo " wipe-release - wipe all products of release build " - @echo " build - build debug binaries" - @echo " build-release - build release binaries" - @echo " build-coverity - build coverity artifacts" - @echo " rebuild - wipe and build debug binares" - @echo " rebuild-release - wipe and build release binares" - @echo " run - run debug binary" - @echo " run-release - run release binary" - @echo " debug - run debug binary with debugger" - @echo " debug-release - run release binary with debugger" - @echo " test - build and run (basic) functional tests" - @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-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" - @echo " retest - run functional tests" - @echo " retest-debug - run functional tests (debug build)" - @echo " test-help - show help on test framework" - @echo " run-vat - run vpp-api-test tool" - @echo " pkg-deb - build DEB packages" - @echo " vom-pkg-deb - build vom DEB packages" - @echo " pkg-rpm - build RPM 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" - @echo " checkstyle - check coding style" - @echo " fixstyle - fix coding style" - @echo " doxygen - (re)generate documentation" - @echo " bootstrap-doxygen - setup Doxygen dependencies" - @echo " wipe-doxygen - wipe all generated documentation" + @echo " install-dep - install software dependencies" + @echo " wipe - wipe all products of debug build " + @echo " wipe-release - wipe all products of release build " + @echo " build - build debug binaries" + @echo " build-release - build release binaries" + @echo " build-coverity - build coverity artifacts" + @echo " rebuild - wipe and build debug binares" + @echo " rebuild-release - wipe and build release binares" + @echo " run - run debug binary" + @echo " run-release - run release binary" + @echo " debug - run debug binary with debugger" + @echo " debug-release - run release binary with debugger" + @echo " test - build and run (basic) functional tests" + @echo " test-debug - build and run (basic) functional tests (debug build)" + @echo " test-all - build and run functional and extended tests" + @echo " test-all-debug - build and run functional and extended tests (debug build)" + @echo " test-gcov - build and run functional tests (gcov build)" + @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" + @echo " retest - run functional tests" + @echo " retest-debug - run functional tests (debug build)" + @echo " test-help - show help on test framework" + @echo " run-vat - run vpp-api-test tool" + @echo " pkg-deb - build DEB packages" + @echo " pkg-deb-debug - build DEB debug packages" + @echo " vom-pkg-deb - build vom DEB packages" + @echo " vom-pkg-deb-debug - build vom DEB debug packages" + @echo " pkg-rpm - build RPM 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" + @echo " checkstyle - check coding style" + @echo " fixstyle - fix coding style" + @echo " doxygen - (re)generate documentation" + @echo " bootstrap-doxygen - setup Doxygen dependencies" + @echo " wipe-doxygen - wipe all generated documentation" + @echo " checkfeaturelist - check FEATURE.yaml according to schema" + @echo " featurelist - dump feature list in markdown" + @echo " json-api-files - (re)-generate json api files" + @echo " json-api-files-debug - (re)-generate json api files for debug target" @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" - @echo " test-wipe-cov - wipe code coverage report for test framework" - @echo " test-checkstyle - check PEP8 compliance for test framework" + @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" + @echo " test-wipe-cov - wipe code coverage report for test framework" + @echo " test-checkstyle - check PEP8 compliance for test framework" + @echo " test-refresh-deps - refresh the Python dependencies for the tests" @echo "" @echo "Make Arguments:" @echo " V=[0|1] - set build verbosity level" @@ -285,7 +292,6 @@ install-dep: ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) ifeq ($(OS_VERSION_ID),14.04) @sudo -E apt-get $(CONFIRM) $(FORCE) install software-properties-common - @sudo -E add-apt-repository ppa:openjdk-r/ppa $(CONFIRM) endif ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8) @grep -q jessie-backports /etc/apt/sources.list /etc/apt/sources.list.d/* 2> /dev/null \ @@ -321,6 +327,7 @@ else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) else $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems") endif + git config commit.template .git_commit_template.txt define make @make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2) @@ -388,6 +395,7 @@ define 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) \ @@ -403,16 +411,22 @@ test: test-debug: $(call test,vpp,vpp_debug,test) +test-gcov: + $(call test,vpp,vpp_gcov,test) + test-all: - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install japi-install,) + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install,) $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp,test) test-all-debug: - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,) + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,) $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,test) +papi-wipe: + @make -C test papi-wipe + test-help: @make -C test help @@ -425,6 +439,9 @@ test-shell: test-shell-debug: $(call test,vpp,vpp_debug,shell) +test-shell-gcov: + $(call test,vpp,vpp_gcov,shell) + test-dep: @make -C test test-dep @@ -435,7 +452,7 @@ test-wipe-doc: @make -C test wipe-doc test-cov: - @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install + @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_gcov,cov) @@ -445,6 +462,9 @@ test-wipe-cov: test-checkstyle: @make -C test checkstyle +test-refresh-deps: + @make -C test refresh-deps + retest: $(call test,vpp,vpp,retest) @@ -520,6 +540,12 @@ dpdk-install-dev: install-ext-deps: make -C build/external install-$(PKG) +json-api-files: + $(WS_ROOT)/src/tools/vppapigen/generate_json.py + +json-api-files-debug: + $(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target + ctags: ctags.files @ctags --totals --tag-relative -L $< @rm $< @@ -536,6 +562,12 @@ checkstyle: fixstyle: @build-root/scripts/checkstyle.sh --fix +featurelist: + @build-root/scripts/fts.py --all --markdown + +checkfeaturelist: + @build-root/scripts/fts.py --validate --git-status + # # Build the documentation # @@ -574,20 +606,26 @@ docs: $(DOCS_DIR) docs-clean: @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean) -verify: install-dep $(BR)/.deps.ok install-ext-deps +pkg-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") @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install $(call banner,"Building libmemif") @make -C build-root PLATFORM=vpp TAG=vpp libmemif-install - $(call banner,"Building JAPI") - @make -C build-root PLATFORM=vpp TAG=vpp japi-install $(call banner,"Building VOM") @make -C build-root PLATFORM=vpp TAG=vpp vom-install $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) +ifeq ($(OS_ID),ubuntu) + $(call banner,"Building VOM $(PKG) package") + @make vom-pkg-deb +endif + +verify: pkg-verify ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) + $(call banner,"Testing vppapigen") + @src/tools/vppapigen/test_vppapigen.py $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif