VPP-530: make jvpp generator use json api representation

Depends on https://gerrit.fd.io/r/#/c/3963/

Change-Id: I5abef531e73bb34c7f06d9206b63c05468c14b14
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/nsh-plugin/java/Makefile.am b/nsh-plugin/java/Makefile.am
index 3d9ebbe..4dfd6f4 100644 (file)
--- a/nsh-plugin/java/Makefile.am
+++ b/nsh-plugin/java/Makefile.am
@@ -42,12 +42,12 @@ libjvpp_nsh_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I
 
 BUILT_SOURCES = jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h
 
-jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h: defs_nsh_sfc_papi.py
+jvpp/io_fd_vpp_jvpp_nsh_JVppNshImpl.h: nsh.api.json
        dir=`pwd`;                                              \
        mkdir -p $(java_gendir)/$(java_packagedir);             \
        cd $(java_gendir)/$(java_packagedir);                   \
        mkdir -p dto future callfacade callback notification test;      \
-       $(jvpp_gen) -i $${dir}/defs_nsh_sfc_papi.py --plugin_name nsh;          \
+       $(jvpp_gen) -i $${dir}/nsh.api.json --plugin_name nsh;          \
        cd -;                                                   \
        mv -f $(java_gendir)/$(java_packagedir)/jvpp_nsh_gen.h jvpp/jvpp_nsh_gen.h;                                                     \
        cp $(srcdir)/pom.xml jvpp/;                             \
@@ -63,8 +63,8 @@ $(jarfile_jnsh_sfc): libjvpp_nsh.la
        mvn $${MAVEN_SETTINGS_OPTIONS} -v;      \
        mvn $${MAVEN_SETTINGS_OPTIONS} package;
 
-defs_nsh_sfc_papi.py:
+nsh.api.json:
        @echo "  jNsh_sfc API"; \
-        vppapigen --input $(api_file) --python defs_nsh_sfc_papi.py;
+        vppapigen --input $(api_file) --json nsh.api.json;
         
 all-local: $(jarfile_jnsh_sfc)