LISP: fix fwd entry addition
[vpp.git] / Makefile
index 9870086..447f809 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@ endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
-DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope
-DEB_DEPENDS += python-dev python-virtualenv
+DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
+DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -43,7 +43,7 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 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
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
 EPEL_DEPENDS = libconfuse-devel ganglia-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -57,8 +57,9 @@ endif
 
 .PHONY: help bootstrap 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 plugins plugins-release build-vpp-api
+.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
 
 help:
        @echo "Make Targets:"
@@ -68,8 +69,6 @@ help:
        @echo " wipe-release        - wipe all products of release build "
        @echo " build               - build debug binaries"
        @echo " build-release       - build release binaries"
-       @echo " plugins             - build debug plugin binaries"
-       @echo " plugins-release     - build release plugin binaries"
        @echo " rebuild             - wipe and build debug binares"
        @echo " rebuild-release     - wipe and build release binares"
        @echo " run                 - run debug binary"
@@ -82,8 +81,6 @@ help:
        @echo " retest              - run functional tests"
        @echo " retest-debug        - run functional tests (debug build)"
        @echo " test-help           - show help on test framework"
-       @echo " build-vat           - build vpp-api-test tool"
-       @echo " build-vpp-api       - build vpp-api"
        @echo " run-vat             - run vpp-api-test tool"
        @echo " pkg-deb             - build DEB packages"
        @echo " pkg-rpm             - build RPM packages"
@@ -97,6 +94,8 @@ help:
        @echo " wipe-doxygen        - wipe all generated documentation"
        @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 ""
        @echo "Make Arguments:"
        @echo " V=[0|1]             - set build verbosity level"
@@ -118,6 +117,9 @@ help:
        @echo " DPDK_VERSION = $(DPDK_VERSION)"
 
 $(BR)/.bootstrap.ok:
+ifeq ($(findstring y,$(UNATTENDED)),y)
+       make install-dep
+endif
 ifeq ($(OS_ID),ubuntu)
        @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
        if [ -n "$$MISSING" ] ; then \
@@ -141,7 +143,7 @@ else
        @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 vppapigen-install
+       @make -C $(BR) V=$(V) is_build_tool=yes tools-install
        @touch $@
 
 bootstrap: $(BR)/.bootstrap.ok
@@ -200,24 +202,17 @@ wipe-release: $(BR)/.bootstrap.ok
 
 rebuild-release: wipe-release build-release
 
-plugins: $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM)_debug,plugins-install)
-
-plugins-release: $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM),plugins-install)
-
-build-vpp-api: $(BR)/.bootstrap.ok
-       $(call make,$(PLATFORM)_debug,vpp-api-install)
-
 VPP_PYTHON_PREFIX=$(BR)/python
 
 define test
-       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install vpp-api-test-install,)
+       $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
        make -C test \
+         BR=$(BR) \
+         VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
          VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
-         VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \
-         VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/plugins/lib64/vpp_plugins \
-         LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
+         VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
+         VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
+         LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
          WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
 endef
 
@@ -239,6 +234,12 @@ test-doc:
 test-wipe-doc:
        @make -C test wipe-doc BR=$(BR)
 
+test-cov: bootstrap
+       $(call test,vpp_lite,vpp_lite_gcov,cov)
+
+test-wipe-cov:
+       @make -C test wipe-cov BR=$(BR)
+
 retest:
        $(call test,vpp_lite,vpp_lite,retest)
 
@@ -251,12 +252,12 @@ 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 $(1)/plugins/lib64/vpp_plugins
+         sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/vpp/lib64/vpp_plugins
 endef
 else
 define run
        @cd $(STARTUP_DIR) && \
-         sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/plugins/lib64/vpp_plugins
+         sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/vpp/lib64/vpp_plugins
 endef
 endif
 
@@ -283,7 +284,7 @@ build-vat:
        $(call make,$(PLATFORM)_debug,vpp-api-test-install)
 
 run-vat:
-       @sudo $(BR)/install-$(PLATFORM)_debug-native/vpp-api-test/bin/vpp_api_test
+       @sudo $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test
 
 pkg-deb:
        $(call make,$(PLATFORM),install-deb)
@@ -329,3 +330,32 @@ doxygen:
 wipe-doxygen:
        $(call make-doxy)
 
+define banner
+       @echo "========================================================================"
+       @echo " $(1)"
+       @echo "========================================================================"
+       @echo " "
+endef
+
+verify: install-dep $(BR)/.bootstrap.ok
+       $(call banner,"Building for PLATFORM=vpp using gcc")
+       @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
+       $(call banner,"Building for PLATFORM=vpp_lite using gcc")
+       @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
+ifeq ($(OS_ID),ubuntu)
+ifeq ($(OS_VERSION_ID),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 deb packages")
+       @make pkg-deb
+endif
+ifeq ($(OS_ID),centos)
+       $(call banner,"Building rpm packages")
+       @make pkg-rpm
+endif
+
+