aboutsummaryrefslogtreecommitdiffstats
path: root/build-data
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-07-30 16:10:14 +0200
committerDave Barach <openvpp@barachs.net>2018-08-01 20:28:53 +0000
commitcc4a5e8089967f0c266e9c5ed319c38c111004cd (patch)
treebc290e03e12a0a02c3fc274740c96eef9e1707c6 /build-data
parenta14c16674023bd6672ca49e3551c707702711050 (diff)
Move java api to extras/
Change-Id: Ibd5cbbdfb22a235442cddaebc9eae9a3c4e35ec9 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'build-data')
-rw-r--r--build-data/packages/japi.mk6
-rw-r--r--build-data/platforms.mk2
-rw-r--r--build-data/platforms/vpp.mk2
3 files changed, 8 insertions, 2 deletions
diff --git a/build-data/packages/japi.mk b/build-data/packages/japi.mk
new file mode 100644
index 00000000000..d6435930f4a
--- /dev/null
+++ b/build-data/packages/japi.mk
@@ -0,0 +1,6 @@
+japi_configure_depend = vpp-install
+japi_source = extras
+japi_configure_subdir = japi
+japi_CPPFLAGS = $(call installed_includes_fn, vpp) $(call installed_includes_fn, vpp)/vpp_plugins
+japi_LDFLAGS = $(call installed_libs_fn, vpp)
+
diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index d555f2ab3eb..a8bd44ee15b 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -86,7 +86,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
>> deb/debian/vpp-dev.install ; \
echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/JSON.py /usr/share/vpp \
>> deb/debian/vpp-dev.install ; \
- echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin \
+ echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin \
>> deb/debian/vpp-dev.install ; \
for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do \
echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen \
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 5e4980aad12..0687946dbb9 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -26,7 +26,7 @@ vpp_uses_dpdk = yes
# Uncoment to enable building unit tests
# vpp_enable_tests = yes
-vpp_root_packages = vpp vom
+vpp_root_packages = vpp vom japi
# DPDK configuration parameters
# vpp_uses_dpdk_mlx4_pmd = yes