Merge "moving inventory file parsing to python"

[apex.git] / build / Makefile

diff --git a/build/Makefile b/build/Makefile
index 69c66f9..89aa647 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -164,6 +164,7 @@ vpp-clean:
        @rm -f vpp-bin.tar.gz
        @rm -rf vpp-bin vpp
        @rm -rf honeycomb $(MAVEN) $(MAVEN_FILE) honeycomb-1.0.0-99.noarch.rpm
+       @rm -rf networking-vpp networking-vpp.noarch.rpm
 
 .PHONY: vpp-build
 vpp-build: vpp-bin.tar.gz
@@ -172,6 +173,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
@@ -193,6 +196,15 @@ $(MAVEN): $(MAVEN_FILE)
 $(MAVEN_FILE):
        wget http://www.webhostingjams.com/mirror/apache/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
 
+.PHONY: networking-vpp-rpm
+networking-vpp-rpm: networking-vpp.noarch.rpm
+
+networking-vpp.noarch.rpm: networking-vpp
+       pushd networking-vpp && python setup.py bdist_rpm --binary-only
+       mv networking-vpp/dist/*.rpm networking-vpp.noarch.rpm
+
+networking-vpp:
+       git clone -b stable https://github.com/naveenjoy/networking-vpp.git
 
 ###############
 #  UNDERCLOUD #
@@ -239,7 +251,7 @@ overcloud-full-clean:
 .PHONY: overcloud-full
 overcloud-full: images/overcloud-full.qcow2
 
-images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm vpp-build
+images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm networking-vpp-rpm
        @echo "Building the Apex Base Overcloud Image"
        @./overcloud-full.sh