From f750ac2b79fa150f5ff4d57281d04024658f3f42 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 16 Dec 2015 20:52:23 +0100 Subject: Move vppctl to vpp-api-test Change-Id: I4af0eb9c09d14a1a9803cf1b25bc3d7b814c82cc Signed-off-by: Damjan Marion --- build-data/packages/vppctl.mk | 11 ----------- build-data/platforms/vpp.mk | 2 +- vpp-api-test/Makefile.am | 1 + vpp-api-test/scripts/vppctl | 2 ++ vppctl/Makefile.am | 2 -- vppctl/configure.ac | 4 ---- vppctl/vppctl | 2 -- 7 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 build-data/packages/vppctl.mk create mode 100644 vpp-api-test/scripts/vppctl delete mode 100644 vppctl/Makefile.am delete mode 100644 vppctl/configure.ac delete mode 100755 vppctl/vppctl diff --git a/build-data/packages/vppctl.mk b/build-data/packages/vppctl.mk deleted file mode 100644 index a5f8757b536..00000000000 --- a/build-data/packages/vppctl.mk +++ /dev/null @@ -1,11 +0,0 @@ -vppctl_configure_depend = \ - vppinfra-install \ - dpdk-install \ - svm-install \ - vlib-api-install \ - vlib-install \ - vnet-install \ - vpp-install \ - vpp-api-test-install - - diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index b84fc976ea4..a09b0307db5 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -16,7 +16,7 @@ vpp_arch = native vpp_native_tools = vppapigen vpp_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \ - vpp-japi vppctl + vpp-japi vpp_configure_args_vpp = --with-dpdk vnet_configure_args_vpp = --with-dpdk diff --git a/vpp-api-test/Makefile.am b/vpp-api-test/Makefile.am index a818d831b28..ae071bcebe0 100644 --- a/vpp-api-test/Makefile.am +++ b/vpp-api-test/Makefile.am @@ -32,3 +32,4 @@ vpe_json_test_LDADD = -lvppinfra -lm nobase_include_HEADERS = vat/vat.h vat/json_format.h +dist_bin_SCRIPTS = scripts/vppctl diff --git a/vpp-api-test/scripts/vppctl b/vpp-api-test/scripts/vppctl new file mode 100644 index 00000000000..b789493f2be --- /dev/null +++ b/vpp-api-test/scripts/vppctl @@ -0,0 +1,2 @@ +#!/bin/bash +echo exec ${@} | vpe_api_test | sed 's/vat# //g' diff --git a/vppctl/Makefile.am b/vppctl/Makefile.am deleted file mode 100644 index d556cb2aa5c..00000000000 --- a/vppctl/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -dist_bin_SCRIPTS = vppctl diff --git a/vppctl/configure.ac b/vppctl/configure.ac deleted file mode 100644 index 0421019452a..00000000000 --- a/vppctl/configure.ac +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT([vppctl], [1.0]) -AM_INIT_AUTOMAKE([foreign -Wall -Werror]) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/vppctl/vppctl b/vppctl/vppctl deleted file mode 100755 index b789493f2be..00000000000 --- a/vppctl/vppctl +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo exec ${@} | vpe_api_test | sed 's/vat# //g' -- cgit 1.2.3-korg