diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2019-07-24 13:42:36 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2019-07-24 13:59:16 +0000 |
| commit | 7f37a94bab6d4fac88454105e3a281d57487dbf6 (patch) | |
| tree | c37ea3804998924d56b06a360522724616f33719 | |
| parent | 6ce0f35cc785056ffcb250a6bc6ef75ba9e1a1b4 (diff) | |
vapi: add python scripts to vpp-dev package
As requested in https://lists.fd.io/g/vpp-api-dev/message/18
three vapi scrips are packaged, destination to share/vpp/.
Also:
+ Add "vapi" as a separate component to maintainers file.
+ Add also vppapigen/generate_json.py to share/vpp/.
+ Improve CMakeLists.txt indentation.
Type: feature
Change-Id: Ia06715621aa344e8ee759410b293509a54f81fdd
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | src/tools/vppapigen/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/vpp-api/vapi/CMakeLists.txt | 26 |
3 files changed, 35 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e42f07be398..9c9af5d9584 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -419,11 +419,16 @@ I: vmxnet3 M: Steven Luong <sluong@cisco.com> F: src/plugins/vmxnet3/ -Binary API Compiler +Binary API Compiler for Python I: vppapigen M: Ole Troan <otroan@employees.org> F: src/tools/vppapigen/ +Binary API Compiler for C and C++ +I: vapi +M: Ole Troan <ot@cisco.com> +F: src/vpp-api/vapi + Plugin - RDMA (ibverb) driver I: rdma M: Benoît Ganne <bganne@cisco.com> diff --git a/src/tools/vppapigen/CMakeLists.txt b/src/tools/vppapigen/CMakeLists.txt index ce25cb0c9e7..9fb00817ea9 100644 --- a/src/tools/vppapigen/CMakeLists.txt +++ b/src/tools/vppapigen/CMakeLists.txt @@ -21,4 +21,13 @@ install( COMPONENT vpp-dev ) -install(FILES vppapigen_c.py vppapigen_json.py DESTINATION share/vpp COMPONENT vpp-dev) +install( + FILES + vppapigen_c.py + vppapigen_json.py + generate_json.py + DESTINATION + share/vpp + COMPONENT + vpp-dev +) diff --git a/src/vpp-api/vapi/CMakeLists.txt b/src/vpp-api/vapi/CMakeLists.txt index 120bfd4d69f..06c9f85dbba 100644 --- a/src/vpp-api/vapi/CMakeLists.txt +++ b/src/vpp-api/vapi/CMakeLists.txt @@ -74,12 +74,24 @@ add_vpp_library(vapiclient install( FILES - vapi.h - vapi_common.h - vapi_dbg.h - vapi.hpp - vapi_internal.h + vapi.h + vapi_common.h + vapi_dbg.h + vapi.hpp + vapi_internal.h + DESTINATION + include/vapi + COMPONENT + vpp-dev +) - DESTINATION include/vapi - COMPONENT vpp-dev +install( + FILES + vapi_c_gen.py + vapi_json_parser.py + vapi_cpp_gen.py + DESTINATION + share/vpp + COMPONENT + vpp-dev ) |