Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
API refactoring : l2tp
[vpp.git] / vpp-api / java / Makefile.am
diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am
index 7b674fc..4542f41 100644 (file)
--- a/vpp-api/java/Makefile.am
+++ b/vpp-api/java/Makefile.am
@@ -13,13 +13,13 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Wall 
+AM_CFLAGS = -Wall
 
-noinst_PROGRAMS = 
+noinst_PROGRAMS =
 BUILT_SOURCES =
-bin_PROGRAMS = 
-CLEANFILES = 
-lib_LTLIBRARIES = 
+bin_PROGRAMS =
+CLEANFILES =
+lib_LTLIBRARIES =
 
 #
 # jvpp-common
@@ -46,28 +46,22 @@ libjvpp_registry_la_SOURCES = jvpp-registry/jvpp_registry.c
 libjvpp_registry_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
                      -lpthread -lm -lrt -ljvpp_common
 libjvpp_registry_la_LDFLAGS = -module
-libjvpp_registry_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+libjvpp_registry_la_CPPFLAGS = -Ijvpp-registry -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 EXTRA_libjvpp_registry_la_DEPENDENCIES=libjvpp_common.la
 
 jarfile_jvpp_registry = jvpp-registry-$(PACKAGE_VERSION).jar
-packagedir_jvpp_registry = org/openvpp/jvpp
+packagedir_jvpp_registry = io/fd/vpp/jvpp
 
-BUILT_SOURCES += jvpp-registry/org_openvpp_jvpp_VppJNIConnection.h
+BUILT_SOURCES += jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h
 
+jvpp_registry_src_files := $(wildcard @srcdir@/jvpp-registry/$(packagedir_jvpp_registry)/*.java) $(wildcard @srcdir@/jvpp-registry/$(packagedir_jvpp_registry)/**/*.java)
 
-jvpp-registry/org_openvpp_jvpp_VppJNIConnection.h:
-       @echo " jvpp-registry.jar generation ";                         \
-       mkdir -p jvpp-registry/target;                          \
-       cp -rf @srcdir@/jvpp-registry/* -t jvpp-registry/;
-       $(JAVAC) -d jvpp-registry/target jvpp-registry/$(packagedir_jvpp_registry)/*.java \
-               jvpp-registry/$(packagedir_jvpp_registry)/dto/*.java  \
-               jvpp-registry/$(packagedir_jvpp_registry)/callback/*.java \
-               jvpp-registry/$(packagedir_jvpp_registry)/notification/*.java \
-               jvpp-registry/$(packagedir_jvpp_registry)/future/*.java         \
-               jvpp-registry/$(packagedir_jvpp_registry)/test/*.java   \
-               || (echo "jvpp-registry compilation failed: $$?"; exit 1);      \
-       $(JAVAH) -classpath jvpp-registry/target -d jvpp-registry org.openvpp.jvpp.VppJNIConnection ;
-       $(JAVAH) -classpath jvpp-registry/target -d jvpp-registry org.openvpp.jvpp.JVppRegistryImpl ;
+jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h: $(jvpp_registry_src_files)
+       @echo " jvpp-registry.jar generation"
+       mkdir -p jvpp-registry/target
+       $(JAVAC) -d jvpp-registry/target $(jvpp_registry_src_files)
+       $(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.VppJNIConnection
+       $(JAVAH) -force -classpath jvpp-registry/target -d jvpp-registry io.fd.vpp.jvpp.JVppRegistryImpl
 
 $(jarfile_jvpp_registry): libjvpp_registry.la
        cp .libs/libjvpp_registry.so.0.0.0 jvpp-registry/target;        \
@@ -83,40 +77,59 @@ libjvpp_core_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
                      -lpthread -lm -lrt -ljvpp_common
 libjvpp_core_la_LDFLAGS = -module
 libjvpp_core_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-EXTRA_libjvpp_core_la_DEPENDENCIES=libjvpp_common.la
 
 jarfile_jvpp_core = jvpp-core-$(PACKAGE_VERSION).jar
-packagedir_jvpp_core = org/openvpp/jvpp/core
-api_file = $(prefix)/../vpp/vpp-api/vpe.api
+packagedir_jvpp_core = io/fd/vpp/jvpp/core
+
+BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h
+
+jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h:          \
+    jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h    \
+    $(prefix)/../vnet/vnet/af_packet.api.json          \
+    $(prefix)/../vnet/vnet/netmap.api.json             \
+    $(prefix)/../vnet/vnet/vhost_user.api.json         \
+    $(prefix)/../vpp/vpp-api/vpe.api.json              \
+    $(prefix)/../vnet/vnet/gre.api.json                        \
+    $(prefix)/../vnet/vnet/ip.api.json                         \
+    $(prefix)/../vnet/vnet/l2tp.api.json               \
+    $(prefix)/../vnet/vnet/tap.api.json                \
+    $(prefix)/../vnet/vnet/vxlan.api.json              \
+    $(prefix)/../vnet/vnet/vxlan_gpe.api.json
+       cp -rf @srcdir@/jvpp-core/* -t jvpp-core/
+       mkdir -p jvpp-core/target
+       cd jvpp-core \
+               && mkdir -p types dto future callfacade callback notification \
+               && @srcdir@/jvpp/gen/jvpp_gen.py  --plugin_name core \
+                   -i $(prefix)/../vpp/vpp-api/vpe.api.json \
+                   $(prefix)/../vnet/vnet/af_packet.api.json \
+                   $(prefix)/../vnet/vnet/netmap.api.json \
+                   $(prefix)/../vnet/vnet/vhost_user.api.json \
+                   $(prefix)/../vnet/vnet/gre.api.json \
+                   $(prefix)/../vnet/vnet/interface.api.json \
+                   $(prefix)/../vnet/vnet/l2.api.json \
+                   $(prefix)/../vnet/vnet/l2tp.api.json \
+                   $(prefix)/../vnet/vnet/map.api.json \
+                   $(prefix)/../vnet/vnet/ip.api.json \
+                   $(prefix)/../vnet/vnet/span.api.json \
+                   $(prefix)/../vnet/vnet/tap.api.json \
+                   $(prefix)/../vnet/vnet/vxlan.api.json \
+                   $(prefix)/../vnet/vnet/vxlan_gpe.api.json \
+               && cp -rf types dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \
+               && rm -rf types dto future callfacade callback notification *.java
 
-BUILT_SOURCES += jvpp-core/org_openvpp_jvpp_core_JVppCoreImpl.h
-
-
-defs_vpp_papi.py:
-       @echo "jVpp API";                               \
-       vppapigen --input $(api_file) --python jvpp-core/defs_vpp_papi.py;
-
-jvpp-core/org_openvpp_jvpp_core_JVppCoreImpl.h: defs_vpp_papi.py
-       cp -rf @srcdir@/jvpp-core/* -t jvpp-core/; \
-       mkdir -p jvpp-core/target; \
-       cd jvpp-core; \
-       mkdir dto future callfacade callback notification; \
-       @srcdir@/jvpp/gen/jvpp_gen.py -i defs_vpp_papi.py --plugin_name core; \
-       cp -rf dto future callfacade callback notification *.java -t $(packagedir_jvpp_core); \
-       rm -rf dto future callfacade callback notification *.java; \
-       cd ..; \
        $(JAVAC) -classpath jvpp-registry/target -d jvpp-core/target jvpp-core/$(packagedir_jvpp_core)/*.java \
+               jvpp-core/$(packagedir_jvpp_core)/types/*.java \
                jvpp-core/$(packagedir_jvpp_core)/dto/*.java \
                jvpp-core/$(packagedir_jvpp_core)/callback/*.java \
                jvpp-core/$(packagedir_jvpp_core)/notification/*.java \
                jvpp-core/$(packagedir_jvpp_core)/future/*.java         \
                jvpp-core/$(packagedir_jvpp_core)/callfacade/*.java     \
-               jvpp-core/$(packagedir_jvpp_core)/test/*.java \
-               || (echo "jvpp-core compilation failed: $$?"; exit 1); \
-       $(JAVAH) -classpath jvpp-registry/target:jvpp-core/target -d jvpp-core org.openvpp.jvpp.core.JVppCoreImpl ;
-       
+               jvpp-core/$(packagedir_jvpp_core)/test/*.java   \
+               || (echo "jvpp-core compilation failed: $$?"; exit 1)
+       $(JAVAH) -force -classpath jvpp-registry/target:jvpp-core/target -d jvpp-core io.fd.vpp.jvpp.core.JVppCoreImpl
+
 $(jarfile_jvpp_core): libjvpp_core.la
-       cp .libs/libjvpp_core.so.0.0.0 jvpp-core/target;        \
-       $(JAR) cf $(JARFLAGS) $@ -C jvpp-core/target .;
+       cp .libs/libjvpp_core.so.0.0.0 jvpp-core/target
+       $(JAR) cf $(JARFLAGS) $@ -C jvpp-core/target .
 
 all-local: $(jarfile_jvpp_registry) $(jarfile_jvpp_core)
Vector Packet Processing