From: Marek Gradzki <mgradzki@cisco.com>
Date: Fri, 8 Dec 2017 14:26:55 +0000 (+0100)
Subject: jvpp: include all api files from @top_builddir@/vpp
X-Git-Tag: v18.04-rc0~89
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=87a137c77b53753710a0706a35bee5574c0a9c1a

jvpp: include all api files from @top_builddir@/vpp

Currently:
- vpe.api (supported previously)
- stats.api
- oam.api

Change-Id: Iab48d5d142e9a1ea0a4f366352b1d9429cc47309
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---

diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am
index 1ce6dffd0b6..0c450d6e984 100644
--- a/src/vpp-api/java/Makefile.am
+++ b/src/vpp-api/java/Makefile.am
@@ -102,8 +102,12 @@ libjvpp_core_la_DEPENDENCIES = libjvpp_common.la
 BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
 JAR_FILES += jvpp-core-$(PACKAGE_VERSION).jar
 CLEANDIRS += jvpp-core/target
+
+# Include all VPP API files
 jvpp_core_json_files = $(shell find @top_builddir@/vnet/ -type f -name '*.api.json')
-jvpp_core_json_files += @top_builddir@/vpp/api/vpe.api.json
+jvpp_core_json_files += $(shell find @top_builddir@/vpp/ -type f -name '*.api.json')
+# except for plugins and unsupported ones:
+# jvpp_core_json_files += @top_builddir@/vlibmemory/memclnt.api.json
 
 jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: $(jvpp_registry_ok) $(jvpp_core_json_files)
 	$(call japigen,core,JVppCoreImpl)
diff --git a/src/vpp-api/java/jvpp/gen/jvpp_gen.py b/src/vpp-api/java/jvpp/gen/jvpp_gen.py
index ca2d2624d50..9a1dad9c53d 100755
--- a/src/vpp-api/java/jvpp/gen/jvpp_gen.py
+++ b/src/vpp-api/java/jvpp/gen/jvpp_gen.py
@@ -29,8 +29,6 @@ from jvppgen import jvpp_impl_gen
 from jvppgen import jvpp_c_gen
 from jvppgen import util
 
-blacklist = [ "memclnt.api", "flowprobe.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
@@ -72,9 +70,6 @@ except OSError:
 os.chdir(work_dir)
 
 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(cwd + "/" + inputfile, 'r'))
     if 'types' in cfg:
         cfg['types'].extend(_cfg['types'])