X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=e0c710fdfd7515514d78a4b2966057c1badd151d;hb=555ea9a105bd0681e3b94c77cf8d9cfe22be03a9;hp=0ea903c3d8f1691a2951137d3a8e7c6e55f18b64;hpb=55f99675e5d8aeeb398008cf3e73856c023ff587;p=vpp.git

diff --git a/Makefile b/Makefile
index 0ea903c3d8f..e0c710fdfd7 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +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
@@ -52,7 +54,7 @@ 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
 
@@ -64,6 +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
 ifeq ($(OS_VERSION_ID),14.04)
 	DEB_DEPENDS += openjdk-8-jdk-headless
 	DEB_DEPENDS += libssl-dev
@@ -74,7 +77,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-9)
 	DEB_DEPENDS += default-jdk-headless
 	DEB_DEPENDS += libssl1.0-dev
-else 
+else
 	DEB_DEPENDS += default-jdk-headless
 	DEB_DEPENDS += libssl-dev
 endif
@@ -84,24 +87,28 @@ RPM_DEPENDS += apr-devel
 RPM_DEPENDS += numactl-devel
 RPM_DEPENDS += check check-devel
 RPM_DEPENDS += boost boost-devel
-RPM_DEPENDS += subunit subunit-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
-RPM_DEPENDS += mbedtls-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
 
@@ -110,8 +117,9 @@ endif
 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)
+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 indent libtool make python-ply
+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
@@ -122,12 +130,23 @@ RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros
 RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build
 
 ifeq ($(OS_ID),opensuse)
-ifneq ($(SUSE_NAME),Tumbleweed)
+ifeq ($(SUSE_NAME),Tumbleweed)
+	RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
+	RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv
+endif
+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_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6
 	RPM_SUSE_PYTHON_DEPS += python-virtualenv
-else
-	RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc
-	RPM_SUSE_PYTHON_DEPS += python2-virtualenv
+endif
+endif
+
+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
 
@@ -154,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"
@@ -181,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"
@@ -190,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"
@@ -266,14 +295,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 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 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
@@ -330,7 +370,7 @@ wipe-release: test-wipe $(BR)/.deps.ok
 
 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)))
 
@@ -358,10 +398,12 @@ test-debug:
 	$(call test,vpp,vpp_debug,test)
 
 test-all:
+	$(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,test)
 
 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)
 
@@ -377,6 +419,9 @@ test-shell:
 test-shell-debug:
 	$(call test,vpp,vpp_debug,shell)
 
+test-dep:
+	@make -C test test-dep
+
 test-doc:
 	@make -C test doc
 
@@ -399,20 +444,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
 
@@ -432,7 +474,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:
@@ -442,7 +484,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)
@@ -454,7 +496,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 $<
@@ -494,28 +540,37 @@ 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)
 
-verify: install-dep $(BR)/.deps.ok dpdk-install-dev
+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)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04)
+	$(call banner,"Running tests")
 	@make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
 endif