diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2016-11-25 08:38:29 +0100 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2016-11-30 18:24:38 +0000 |
| commit | 2fee4c8fadd31979bd3e72c51d276773d17798d1 (patch) | |
| tree | eae9f319e5b4de6e81c1384b5e4d9b7a75d0d7b3 /plugins | |
| parent | c5b136004543b9861a203af335d1ce61a976382d (diff) | |
VPP-530: adapt jvpp generation for VPP API splitting
Now jvpp uses *.json instead of *.py api representation.
Multiple *.json files are supported.
Change-Id: I89fa556c7d2a35d42833f2faaa28398ebd2ed012
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ioam-plugin/Makefile.am | 8 | ||||
| -rw-r--r-- | plugins/snat-plugin/Makefile.am | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am index cd70f325..c66c6cd5 100644 --- a/plugins/ioam-plugin/Makefile.am +++ b/plugins/ioam-plugin/Makefile.am @@ -158,13 +158,13 @@ libjvpp_ioamtrace_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/li BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h -$(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: defs_ioam_trace_papi.py +$(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: ioam_trace.api.json dir=`pwd`; \ mkdir -p $(jvpp_target); \ mkdir -p $(jvpp_root)/$(jvpp_package_dir); \ cd $(jvpp_root)/$(jvpp_package_dir); \ mkdir -p dto future callfacade callback notification test; \ - @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/defs_ioam_trace_papi.py --plugin_name ioamtrace; \ + @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/ioam_trace.api.json --plugin_name ioamtrace; \ cd -; \ mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_ioamtrace_gen.h $(jvpp_root)/jvpp_ioam_trace_gen.h; \ cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/; \ @@ -184,8 +184,8 @@ $(jioam_trace_jarfile): libjvpp_ioamtrace.la cd $(jvpp_target); \ $(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioamtrace.so.0.0.0 $(jvpp_package_dir)/* ; cd ..; -defs_ioam_trace_papi.py: +ioam_trace.api.json: @echo " jIoam_trace API"; \ - vppapigen --input $(api_file) --python defs_ioam_trace_papi.py; + vppapigen --input $(api_file) --json ioam_trace.api.json; all-local: $(jioam_trace_jarfile) diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am index 0a0fff86..cdf7e356 100644 --- a/plugins/snat-plugin/Makefile.am +++ b/plugins/snat-plugin/Makefile.am @@ -83,13 +83,13 @@ libjvpp_snat_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux - BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h -$(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: defs_snat_papi.py +$(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: snat.api.json dir=`pwd`; \ mkdir -p $(jvpp_target); \ mkdir -p $(jvpp_root)/$(jvpp_package_dir); \ cd $(jvpp_root)/$(jvpp_package_dir); \ mkdir -p dto future callfacade callback notification test; \ - @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/defs_snat_papi.py --plugin_name snat; \ + @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/snat.api.json --plugin_name snat; \ cd -; \ mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_snat_gen.h $(jvpp_root)/jvpp_snat_gen.h; \ cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/; \ @@ -109,8 +109,8 @@ $(jsnat_jarfile): libjvpp_snat.la cd $(jvpp_target); \ $(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_snat.so.0.0.0 $(jvpp_package_dir)/* ; cd ..; -defs_snat_papi.py: +snat.api.json: @echo " jSnat_sfc API"; \ - vppapigen --input $(api_file) --python defs_snat_papi.py; + vppapigen --input $(api_file) --json snat.api.json; all-local: $(jsnat_jarfile) |