vpp-python-api packaging - use easy_install to install the python api

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 12e8904..00699a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -214,12 +214,15 @@ build-vpp-api: $(BR)/.bootstrap.ok
 
 VPP_PYTHON_PREFIX=$(BR)/python
 
+
+       #$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install ,)
 define test
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,)
        make -C test \
          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 \
+         VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
          LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp-api/lib64/ \
          WS_ROOT=$(WS_ROOT) V=$(V) TEST=$(TEST) VPP_PYTHON_PREFIX=$(VPP_PYTHON_PREFIX) $(3)
 endef
@@ -340,6 +343,10 @@ define banner
 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")
@@ -348,9 +355,12 @@ ifeq ($(OS_VERSION_ID),16.04)
        $(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
-       $(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
-       @make test
+ifeq ($(OS_ID),centos)
+       $(call banner,"Building rpm packages")
+       @make pkg-rpm
+endif
+
+