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>

diff --git a/MAINTAINERS b/MAINTAINERS
index e42f07b..9c9af5d 100644 (file)
--- 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 ce25cb0..9fb0081 100644 (file)
--- 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 120bfd4..06c9f85 100644 (file)
--- 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
 )