API: Packaging of JSON files.

Change-Id: If041b6faf1a091d4758b514f0a8cd800ee0e6a89
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Ole Troan <otroan@ot-vpp.cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>

5 files changed, 64 insertions, 26 deletions

diff --git a/plugins/flowperpkt-plugin/Makefile.am b/plugins/flowperpkt-plugin/Makefile.am
index fe0d8b27c7b..1df758ed6f4 100644
--- a/plugins/flowperpkt-plugin/Makefile.am
+++ b/plugins/flowperpkt-plugin/Makefile.am
@@ -28,15 +28,26 @@ flowperpkt_plugin_la_SOURCES = flowperpkt/flowperpkt.c  \
 	flowperpkt/flowperpkt_plugin.api.h
 flowperpkt_plugin_la_LDFLAGS = -module
 
-BUILT_SOURCES = flowperpkt/flowperpkt.api.h
+BUILT_SOURCES =					\
+	flowperpkt/flowperpkt.api.h		\
+	flowperpkt/flowperpkt.api.json
 
-SUFFIXES = .api.h .api
+SUFFIXES = .api.h .api .api.json
 
 %.api.h: %.api
 	mkdir -p `dirname $@` ; \
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
+
+apidir = $(prefix)/flowperpkt/
+api_DATA = flowperpkt/flowperpkt.api.json
+
 noinst_HEADERS =			\
   flowperpkt/flowperpkt_all_api_h.h			\
   flowperpkt/flowperpkt_msg_enum.h			\
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am
index c66c6cd5e7a..a9ed4ab46fa 100644
--- a/plugins/ioam-plugin/Makefile.am
+++ b/plugins/ioam-plugin/Makefile.am
@@ -28,7 +28,8 @@ ioam_pot_plugin_la_SOURCES =			\
 	ioam/lib-pot/pot_api.c
 
 BUILT_SOURCES =					\
-	ioam/lib-pot/pot.api.h ioam/lib-pot/pot.py
+	ioam/lib-pot/pot.api.h			\
+	ioam/lib-pot/pot.api.json
 
 SUFFIXES = .api.h .api
 
@@ -37,14 +38,17 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
-%.py: %.api
-	$(info Creating Python binding for $@)
-	$(CC) $(CPPFLAGS) -E -P -C -x c $<				\
-	| vppapigen --input - --python -				\
-	| pyvppapigen.py --input - > $@
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
 
-pyapidir = ${prefix}/vpp_papi_plugins
-pyapi_DATA = ioam/lib-pot/pot.py
+apidir = $(prefix)/ioam/
+api_DATA =					\
+	ioam/lib-pot/pot.api.json		\
+	ioam/lib-trace/trace.api.json		\
+	ioam/export/ioam_export.api.json
 
 noinst_HEADERS =				\
   ioam/lib-pot/pot_all_api_h.h			\
@@ -73,7 +77,9 @@ ioam/export/node.c                \
 ioam/export/ioam_export.api.h     \
 ioam/export/ioam_export_thread.c
 
-BUILT_SOURCES += ioam/export/ioam_export.api.h
+BUILT_SOURCES +=				\
+	ioam/export/ioam_export.api.h		\
+	ioam/export/ioam_export.api.json
 
 noinst_HEADERS +=                       \
   ioam/export/ioam_export_all_api_h.h   \
@@ -96,10 +102,9 @@ ioam_trace_plugin_la_SOURCES =			\
 	ioam/lib-trace/trace_util.h			\
 	ioam/lib-trace/trace_api.c
 
-BUILT_SOURCES +=					\
-	ioam/lib-trace/trace.api.h ioam/lib-trace/trace.py
-
-pyapi_DATA += ioam/lib-trace/trace.py
+BUILT_SOURCES +=				\
+	ioam/lib-trace/trace.api.h		\
+	ioam/lib-trace/trace.api.json
 
 noinst_HEADERS +=                       \
   ioam/export/ioam_export_all_api_h.h   \
diff --git a/plugins/lb-plugin/Makefile.am b/plugins/lb-plugin/Makefile.am
index 8d92ff1dfc4..8e36027949e 100644
--- a/plugins/lb-plugin/Makefile.am
+++ b/plugins/lb-plugin/Makefile.am
@@ -24,13 +24,26 @@ vppplugins_LTLIBRARIES = lb_plugin.la
 
 lb_plugin_la_SOURCES = lb/lb.c lb/node.c lb/cli.c lb/util.c lb/refcount.c lb/api.c
 
-SUFFIXES = .api.h .api
+BUILT_SOURCES =					\
+	lb/lb.api.h		\
+	lb/lb.api.json
+
+SUFFIXES = .api.h .api .api.json
 
 %.api.h: %.api
 	mkdir -p `dirname $@` ; \
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
+
+apidir = $(prefix)/lb/
+api_DATA = lb/lb.api.json
+
 noinst_HEADERS = lb/lb.h lb/util.h lb/refcount.h  lb/lbhash.h lb/lb.api.h
 
 lb_test_plugin_la_SOURCES = \
diff --git a/plugins/sample-plugin/Makefile.am b/plugins/sample-plugin/Makefile.am
index 0b213791c1a..e221f8c1aa9 100644
--- a/plugins/sample-plugin/Makefile.am
+++ b/plugins/sample-plugin/Makefile.am
@@ -25,7 +25,7 @@ vppplugins_LTLIBRARIES = sample_plugin.la
 sample_plugin_la_SOURCES = sample/sample.c sample/node.c \
 	sample/sample_plugin.api.h
 
-BUILT_SOURCES = sample/sample.api.h
+BUILT_SOURCES = sample/sample.api.h sample/sample.api.json
 
 SUFFIXES = .api.h .api
 
@@ -34,6 +34,15 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
+
+apidir = $(prefix)/sample/
+api_DATA = sample.api.json
+
 noinst_HEADERS =				\
   sample/sample_all_api_h.h			\
   sample/sample_msg_enum.h			\
diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am
index cdf7e3569c5..f10ba25e097 100644
--- a/plugins/snat-plugin/Makefile.am
+++ b/plugins/snat-plugin/Makefile.am
@@ -28,7 +28,7 @@ snat_plugin_la_SOURCES = snat/snat.c		\
         snat/out2in.c				\
 	snat/snat_plugin.api.h
 
-BUILT_SOURCES = snat/snat.api.h snat/snat.py
+BUILT_SOURCES = snat/snat.api.h snat/snat.api.json
 
 SUFFIXES = .api.h .api
 
@@ -37,14 +37,14 @@ SUFFIXES = .api.h .api
 	$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
 	| vppapigen --input - --output $@ --show-name $@
 
-%.py: %.api
-	$(info Creating Python binding for $@)
-	$(CC) $(CPPFLAGS) -E -P -C -x c $<                              \
-	| vppapigen --input - --python -                                \
-	| pyvppapigen.py --input - > $@
+%.api.json: %.api
+	@echo "  JSON APIGEN  " $@ ;				\
+	mkdir -p `dirname $@` ;					\
+	$(CC) $(CPPFLAGS) -E -P -C -x c $^			\
+	| vppapigen --input - --json $@
 
-pyapidir = ${prefix}/vpp_papi_plugins
-pyapi_DATA = snat/snat.py
+apidir = $(prefix)/snat/
+api_DATA = snat.api.json
 
 noinst_HEADERS =			\
   snat/snat_all_api_h.h			\
@@ -60,7 +60,7 @@ install-data-hook:
 	@(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES))
 
 apidir = $(prefix)/snat
-api_DATA = snat/snat.api
+api_DATA = snat/snat.api.json
 
 #
 # Java code generation