X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=f5f10ef77e53145c014de743b3231ca241badb22;hb=c29c0af;hp=ea9d6beea2f0074fbabb96d5057d7bb1ab409ef2;hpb=27de761048e561f849fdda690d69e5644a9360d4;p=vpp.git diff --git a/Makefile b/Makefile index ea9d6beea2f..f5f10ef77e5 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,9 @@ CCACHE_DIR?=$(BR)/.ccache GDB?=gdb PLATFORM?=vpp SAMPLE_PLUGIN?=no +STARTUP_DIR?=$(PWD) +MACHINE=$(shell uname -m) +SUDO?=sudo ,:=, define disable_plugins @@ -51,55 +54,103 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse opensuse-leap opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) PKG=rpm endif # +libganglia1-dev if building the gmond plugin -DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache +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 nasm indent libnuma-dev -DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 +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 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 yum-utils -RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel -RPM_DEPENDS += python-devel numactl-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 + 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) + 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_GROUPS = 'C Development Tools and Libraries' else + RPM_DEPENDS += openssl-devel + RPM_DEPENDS += python-devel python-ply RPM_DEPENDS += python-virtualenv + RPM_DEPENDS += devtoolset-7 RPM_DEPENDS_GROUPS = 'Development Tools' endif # +ganglia-devel if building the ganglia plugin RPM_DEPENDS += chrpath libffi-devel rpm-build -ifeq ($(OS_ID),fedora) - RPM_DEPENDS += nasm -else - RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm + +SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) +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 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_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip +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) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc + RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv endif -EPEL_DEPENDS = libconfuse-devel epel-rpm-macros -ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) - EPEL_DEPENDS += lcov +ifeq ($(SUSE_ID),15.0) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv else - RPM_DEPENDS += lcov + RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python-virtualenv +endif endif -RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static -RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel -RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel +ifeq ($(OS_ID),opensuse-leap) +ifeq ($(SUSE_ID),15.0) + RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv +endif +endif + +RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf @@ -116,15 +167,21 @@ ifneq ($(SAMPLE_PLUGIN),no) TARGETS += sample-plugin endif -.PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release +.PHONY: help wipe wipe-release build build-release rebuild rebuild-release .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm .PHONY: ctags cscope .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 " bootstrap - prepare tree for build" @echo " install-dep - install software dependencies" @echo " wipe - wipe all products of debug build " @echo " wipe-release - wipe all products of release build " @@ -141,6 +198,7 @@ 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" @@ -150,7 +208,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" @@ -159,6 +217,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" @@ -193,7 +254,7 @@ help: @echo " SAMPLE_PLUGIN = $(SAMPLE_PLUGIN)" @echo " DISABLED_PLUGINS = $(DISABLED_PLUGINS)" -$(BR)/.bootstrap.ok: +$(BR)/.deps.ok: ifeq ($(findstring y,$(UNATTENDED)),y) make install-dep endif @@ -206,13 +267,9 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) fi ; \ exit 0 else ifneq ("$(wildcard /etc/redhat-release)","") - @for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \ + @for i in $(RPM_DEPENDS) ; do \ RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3) ; \ - if [[ "$$RPM" =~ "epel-release-latest" ]] ; then \ - MISSING+=$$(rpm -q epel-release | grep "^package") ; \ - else \ - MISSING+=$$(rpm -q $$RPM | grep "^package") ; \ - fi ; \ + MISSING+=$$(rpm -q $$RPM | grep "^package") ; \ done ; \ if [ -n "$$MISSING" ] ; then \ echo "Please install missing RPMs: \n$$MISSING\n" ; \ @@ -221,24 +278,10 @@ else ifneq ("$(wildcard /etc/redhat-release)","") fi ; \ exit 0 endif - @echo "SOURCE_PATH = $(WS_ROOT)" > $(BR)/build-config.mk - @echo "#!/bin/bash\n" > $(BR)/path_setup - @echo 'export PATH=$(BR)/tools/ccache-bin:$$PATH' >> $(BR)/path_setup - @echo 'export PATH=$(BR)/tools/bin:$$PATH' >> $(BR)/path_setup - @echo 'export CCACHE_DIR=$(CCACHE_DIR)' >> $(BR)/path_setup - -ifeq ("$(wildcard /usr/bin/ccache )","") - @echo "WARNING: Please install ccache AYEC and re-run this script" -else - @rm -rf $(BR)/tools/ccache-bin - @mkdir -p $(BR)/tools/ccache-bin - @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/gcc - @ln -s /usr/bin/ccache $(BR)/tools/ccache-bin/g++ -endif - @make -C $(BR) V=$(V) is_build_tool=yes tools-install @touch $@ -bootstrap: $(BR)/.bootstrap.ok +bootstrap: + @echo "'make bootstrap' is not needed anymore" install-dep: ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) @@ -253,14 +296,25 @@ endif @sudo -E apt-get update @sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS) else ifneq ("$(wildcard /etc/redhat-release)","") +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 yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS) - @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib +else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) +else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) - @sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS) + @sudo -E zypper refresh + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else - $(error "This option currently works only on Ubuntu, Debian or Centos systems") + $(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems") endif define make @@ -298,26 +352,26 @@ dist: @$(RM) $(BR)/vpp-latest.tar.xz @ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz -build: $(BR)/.bootstrap.ok +build: $(BR)/.deps.ok $(call make,$(PLATFORM)_debug,$(addsuffix -install,$(TARGETS))) wipedist: @$(RM) $(BR)/*.tar.xz -wipe: wipedist $(BR)/.bootstrap.ok +wipe: wipedist test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS))) rebuild: wipe build -build-release: $(BR)/.bootstrap.ok +build-release: $(BR)/.deps.ok $(call make,$(PLATFORM),$(addsuffix -install,$(TARGETS))) -wipe-release: $(BR)/.bootstrap.ok +wipe-release: test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM),$(addsuffix -wipe,$(TARGETS))) rebuild-release: wipe-release build-release -export VPP_PYTHON_PREFIX=$(BR)/python +export VPP_PYTHON_PREFIX ?= $(BR)/python libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) @@ -333,20 +387,27 @@ define test LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ + OS_ID=$(OS_ID) \ + CACHE_OUTPUT=$(CACHE_OUTPUT) \ $(3) endef -test: bootstrap +test: $(call test,vpp,vpp,test) -test-debug: bootstrap +test-debug: $(call test,vpp,vpp_debug,test) -test-all: bootstrap +test-all: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp,test) -test-all-debug: bootstrap +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: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_debug,test) @@ -356,19 +417,22 @@ test-help: test-wipe: @make -C test wipe -test-shell: bootstrap +test-shell: $(call test,vpp,vpp,shell) -test-shell-debug: bootstrap +test-shell-debug: $(call test,vpp,vpp_debug,shell) +test-dep: + @make -C test test-dep + test-doc: @make -C test doc test-wipe-doc: @make -C test wipe-doc -test-cov: bootstrap +test-cov: $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_gcov,cov) @@ -384,20 +448,17 @@ retest: retest-debug: $(call test,vpp,vpp_debug,retest) -STARTUP_DIR ?= $(PWD) ifeq ("$(wildcard $(STARTUP_CONF))","") define run @echo "WARNING: STARTUP_CONF not defined or file doesn't exist." @echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n" @cd $(STARTUP_DIR) && \ - sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) \ - plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins)) + $(SUDO) $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) endef else define run @cd $(STARTUP_DIR) && \ - sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') \ - plugin_path $(subst $(subst ,, ),:,$(wildcard $(1)/*/lib*/vpp_plugins)) + $(SUDO) $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') endef endif @@ -417,7 +478,7 @@ run-release: debug: $(call run, $(BR)/install-$(PLATFORM)_debug-native,$(GDB) $(GDB_ARGS) --args) -build-coverity: +build-coverity: $(call make,$(PLATFORM)_coverity,install-packages) debug-release: @@ -427,7 +488,7 @@ build-vat: $(call make,$(PLATFORM)_debug,vpp-api-test-install) run-vat: - @sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test + @$(SUDO) $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test pkg-deb: $(call make,$(PLATFORM),install-deb) @@ -439,7 +500,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 $< @@ -479,29 +544,38 @@ 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 -verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev +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 -ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04) - $(call banner,"Installing dependencies") - @sudo -E apt-get update - @sudo -E apt-get $(CONFIRM) $(FORCE) install clang - $(call banner,"Building for PLATFORM=vpp using clang") - @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages -endif $(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)-$(OS_VERSION_ID),ubuntu-16.04) - @make COMPRESS_FAILED_TEST_LOGS=yes test +ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) + $(call banner,"Running tests") + @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif