summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-04-28 12:29:33 +0200
committerEd Warnicke <eaw@cisco.com>2016-05-02 08:46:21 -0500
commit45a42b5d7f6940fbd93d6b3413c2d943e497a0b1 (patch)
treec5a4666a1613689e0186642b3b84af67122d8448 /Makefile
parent52fc44d61bcebb898dc19ab818ff60e617055694 (diff)
HONEYCOMB-10: jVpp - the new java API. Java code generation
The old japi has two main drawbacks: * it is not fully generated (requres manual coding for every new api call that returns data other thanstatus code) * it is not asynchronous from Java perspective (requires active wait loops - big overhead due to JNI boundary being crossed lots of times). The new api is lightweight (fully generated except for connect, disconenct and ping) and truly asynchronous (uses callbacks, utilities that offer java.util.concurrent.Future interface are also provided). Change-Id: I531080ef651e8a74f19210490c71d161221ab600 Signed-off-by: Marek Gradzki <mgradzki@cisco.com> Signed-off-by: Maros Marsalek <mmarsale@cisco.com> Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 53930928059..f4b46f8e34c 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,9 @@ ifeq ("$(shell lsb_release -si)", "Ubuntu")
echo "by executing \"make install-dep\"\n" ; \
exit 1 ; \
fi ; \
+ if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
+ sudo update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \
+ fi ; \
exit 0
endif
@echo "SOURCE_PATH = $(WS_ROOT)" > $(BR)/build-config.mk
@@ -121,6 +124,9 @@ install-dep:
ifeq ("$(shell lsb_release -si)", "Ubuntu")
$(use_ppa_for_jdk8)
@sudo apt-get -y install $(DEB_DEPENDS)
+ if [ "$(shell lsb_release -r | awk '{print $$2}')"=="14.04" ]; then \
+ update-alternatives --set javah /usr/lib/jvm/java-8-openjdk-amd64/bin/javah ; \
+ fi ; \
else ifneq ("$(wildcard /etc/redhat-release)","")
@sudo yum groupinstall -y $(RPM_DEPENDS_GROUPS)
@sudo yum install -y $(RPM_DEPENDS)