summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-26 12:15:30 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-26 12:15:30 +0000
commit0650ee4206e1802240d2d4bef887bb13c3a1a98b (patch)
tree50841528ab5809ee5e9a23ad43898e88a88cab01
parent93876d16276d9bd201b4d50b7ad32ac2a202ba34 (diff)
parent17928dd48ea4b3dd6ae29bd6a1d0621576d3622f (diff)
Merge "Add JVpp to local maven repository during honeycomb/vpp build" into stable/colorado
-rw-r--r--build/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/Makefile b/build/Makefile
index 85f7f8df..2b923596 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -172,6 +172,8 @@ vpp-bin.tar.gz: vpp honeycomb $(MAVEN)
$(MAKE) -C $(VPP_DIR) UNATTENDED=yes install-dep bootstrap build pkg-rpm
$(MAKE) -C $(VPP_DIR)/build-root PLATFORM=vpp TAG=vpp_debug vpp-api-install
pushd vpp/vpp-api/python && python setup.py bdist
+ pushd vpp/build-root/build-vpp-native/vpp-api/java/ && ../../../../../$(MAVEN)/bin/mvn install:install-file -Dfile=jvpp-registry-16.12.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-registry -Dversion=16.12-SNAPSHOT -Dpackaging=jar
+ pushd vpp/build-root/build-vpp-native/vpp-api/java/ && ../../../../../$(MAVEN)/bin/mvn install:install-file -Dfile=jvpp-core-16.12.jar -DgroupId=io.fd.vpp -DartifactId=jvpp-core -Dversion=16.12-SNAPSHOT -Dpackaging=jar
pushd honeycomb && ../$(MAVEN)/bin/mvn clean install -DskipTests
pushd honeycomb/packaging/rpm/ && BUILD_NUMBER=99 ./rpmbuild.sh
mkdir vpp-bin