Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
BVI Interface
[vpp.git] / Makefile
diff --git a/Makefile b/Makefile
index d83cc4f..17a69ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,25 +64,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
 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,6 +87,7 @@ 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
@@ -97,13 +95,13 @@ ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += compat-openssl10-devel
        RPM_DEPENDS += python2-devel python34-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 python34-ply
+       RPM_DEPENDS += python34-devel python34-pip
        RPM_DEPENDS += python-virtualenv
        RPM_DEPENDS += devtoolset-7
        RPM_DEPENDS += cmake3
@@ -119,7 +117,7 @@ SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/
 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
@@ -133,7 +131,7 @@ ifeq ($(SUSE_NAME),Tumbleweed)
        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 +141,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
        RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv
 endif
 endif
@@ -204,6 +202,9 @@ help:
        @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"
@@ -284,7 +285,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 \
@@ -403,12 +403,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,)
+       $(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)
 
@@ -434,6 +434,7 @@ test-wipe-doc:
        @make -C test wipe-doc
 
 test-cov:
+       @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_gcov,cov)
 
@@ -494,9 +495,17 @@ run-vat:
 pkg-deb:
        $(call make,$(PLATFORM),vpp-package-deb)
 
+vom-pkg-deb:
+       $(call make,$(PLATFORM),vpp-package-deb)
+       $(call make,$(PLATFORM),vom-package-deb)
+
 pkg-deb-debug:
        $(call make,$(PLATFORM)_debug,vpp-package-deb)
 
+vom-pkg-deb-debug:
+       $(call make,$(PLATFORM)_debug,vpp-package-deb)
+       $(call make,$(PLATFORM)_debug,vom-package-deb)
+
 pkg-rpm: dist
        make -C extras/rpm
 
@@ -571,8 +580,6 @@ verify: install-dep $(BR)/.deps.ok install-ext-deps
        @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")
Vector Packet Processing