diff options
Diffstat (limited to 'vpp-api/java')
| -rw-r--r-- | vpp-api/java/Makefile.am | 3 | ||||
| -rw-r--r-- | vpp-api/java/jvpp-core/jvpp_core.c | 8 | ||||
| -rw-r--r-- | vpp-api/java/jvpp-registry/jvpp_registry.c | 10 | ||||
| -rwxr-xr-x | vpp-api/java/jvpp/gen/jvpp_gen.py | 5 |
4 files changed, 15 insertions, 11 deletions
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index 92b8c264158..b055196510b 100644 --- a/vpp-api/java/Makefile.am +++ b/vpp-api/java/Makefile.am @@ -84,8 +84,7 @@ packagedir_jvpp_core = io/fd/vpp/jvpp/core BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h JSON_FILES = \ - $(prefix)/../vpp/vpp-api/vpe.api.json \ - $(wildcard $(prefix)/../vnet/vnet/*.api.json) + $(wildcard $(prefix)/../vpp/share/vpp/api/core/*.api.json) jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: \ jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h \ diff --git a/vpp-api/java/jvpp-core/jvpp_core.c b/vpp-api/java/jvpp-core/jvpp_core.c index 107fa78880c..ef4cb8e3e7e 100644 --- a/vpp-api/java/jvpp-core/jvpp_core.c +++ b/vpp-api/java/jvpp-core/jvpp_core.c @@ -15,18 +15,18 @@ #include <vnet/vnet.h> -#include <vpp-api/vpe_msg_enum.h> +#include <vpp/api/vpe_msg_enum.h> #define vl_typedefs /* define message structures */ -#include <vpp-api/vpe_all_api_h.h> +#include <vpp/api/vpe_all_api_h.h> #undef vl_typedefs #define vl_endianfun -#include <vpp-api/vpe_all_api_h.h> +#include <vpp/api/vpe_all_api_h.h> #undef vl_endianfun #define vl_print(handle, ...) #define vl_printfun -#include <vpp-api/vpe_all_api_h.h> +#include <vpp/api/vpe_all_api_h.h> #undef vl_printfun #include <vnet/api_errno.h> diff --git a/vpp-api/java/jvpp-registry/jvpp_registry.c b/vpp-api/java/jvpp-registry/jvpp_registry.c index 7e199b81777..cbd5e0ab39a 100644 --- a/vpp-api/java/jvpp-registry/jvpp_registry.c +++ b/vpp-api/java/jvpp-registry/jvpp_registry.c @@ -16,7 +16,7 @@ #include <vnet/vnet.h> #define vl_api_version(n,v) static u32 vpe_api_version = (v); -#include <vpp-api/vpe.api.h> +#include <vpp/api/vpe.api.h> #undef vl_api_version @@ -25,19 +25,19 @@ #include "io_fd_vpp_jvpp_VppJNIConnection.h" #include "io_fd_vpp_jvpp_JVppRegistryImpl.h" -#include <vpp-api/vpe_msg_enum.h> +#include <vpp/api/vpe_msg_enum.h> #define vl_typedefs /* define message structures */ -#include <vpp-api/vpe_all_api_h.h> +#include <vpp/api/vpe_all_api_h.h> #undef vl_typedefs #define vl_endianfun -#include <vpp-api/vpe_all_api_h.h> +#include <vpp/api/vpe_all_api_h.h> #undef vl_endianfun /* instantiate all the print functions we know about */ #define vl_print(handle, ...) #define vl_printfun -#include <vpp-api/vpe_all_api_h.h> +#include <vpp/api/vpe_all_api_h.h> #undef vl_printfun vlib_main_t vlib_global_main; diff --git a/vpp-api/java/jvpp/gen/jvpp_gen.py b/vpp-api/java/jvpp/gen/jvpp_gen.py index b1cd84c4ad1..5f8df2a9602 100755 --- a/vpp-api/java/jvpp/gen/jvpp_gen.py +++ b/vpp-api/java/jvpp/gen/jvpp_gen.py @@ -30,6 +30,8 @@ from jvppgen import jvpp_impl_gen from jvppgen import jvpp_c_gen from jvppgen import util +blacklist = [ "memclnt.api", "flowperpkt.api" ] + # Invocation: # ~/Projects/vpp/vpp-api/jvpp/gen$ mkdir -p java/io/fd/vpp/jvpp && cd java/io/fd/vpp/jvpp # ~/Projects/vpp/vpp-api/jvpp/gen/java/io/fd/vpp/jvpp$ ../../../../jvpp_gen.py -idefs_api_vpp_papi.py @@ -55,6 +57,9 @@ print "plugin_name %s" % plugin_name cfg = {} for inputfile in args.inputfiles: + if any(substring in inputfile for substring in blacklist): + print "WARNING: Imput file %s blacklisted" % inputfile + continue _cfg = json.load(open(inputfile, 'r')) if 'types' in cfg: cfg['types'].extend(_cfg['types']) |