commit 87ac737b2daaf74a8680f00f0a330b70aca61fab
author Carmelo Cascone <carmelo@opennetworking.org> Fri Sep 15 01:58:59 2017 +0200
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Sep 15 00:19:16 2017 +0000
tree 41090ad387a1e0793f3c3f3d32aee6440cba5e4d
parent f2a5ea6a8747856ea38cc1ab8253953418968f6b

Fixed onos-setup-p4-dev to install nanomsg before P4Runtime

Change-Id: I26b50e30e34d44fdc418e17fff853338a707af95

tools/dev/bin/onos-setup-p4-dev

diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index b8483c5..38ba91b 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -74,6 +74,8 @@
         tcpdump \
         wget \
         unzip
+
+    sudo pip install setuptools cffi
 }
 
 function do_requirements_1404 {
@@ -139,6 +141,30 @@
     unset LDFLAGS
 }
 
+function checkout_bmv2 {
+    cd ${BUILD_DIR}
+    if [ ! -d bmv2 ]; then
+        git clone https://github.com/p4lang/behavioral-model.git bmv2
+    fi
+    cd bmv2
+    git fetch
+    git checkout ${BMV2_COMMIT}
+}
+
+function do_pi_bmv2_deps {
+    checkout_bmv2
+    # From bmv2's install_deps.sh.
+    # Nanomsg is required also by p4runtime.
+    tmpdir=`mktemp -d -p .`
+    cd ${tmpdir}
+    bash ../travis/install-thrift.sh
+    bash ../travis/install-nanomsg.sh
+    sudo ldconfig
+    bash ../travis/install-nnpy.sh
+    cd ..
+    sudo rm -rf $tmpdir
+}
+
 function do_p4runtime {
     cd ${BUILD_DIR}
     if [ ! -d p4runtime ]; then
@@ -157,23 +183,7 @@
 }
 
 function do_bmv2 {
-    cd ${BUILD_DIR}
-    if [ ! -d bmv2 ]; then
-        git clone https://github.com/p4lang/behavioral-model.git bmv2
-    fi
-    cd bmv2
-    git fetch
-    git checkout ${BMV2_COMMIT}
-
-    # From bmv2's install_deps.sh
-    tmpdir=`mktemp -d -p .`
-    cd ${tmpdir}
-    bash ../travis/install-thrift.sh
-    bash ../travis/install-nanomsg.sh
-    sudo ldconfig
-    bash ../travis/install-nnpy.sh
-    cd ..
-    sudo rm -rf $tmpdir
+    checkout_bmv2
 
     ./autogen.sh
     ./configure --enable-debugger --with-pi 'CXXFLAGS=-O0 -g'
@@ -234,9 +244,10 @@
     commit_id="$1"
     proj_dir="$2"
     func_name="$3"
+    simple_name="$4"
     if ${MUST_DO_ALL} = true || check_commit ${commit_id} ${proj_dir}/.last_built_commit; then
         echo "#"
-        echo "# Building ${proj_dir} (${commit_id})"
+        echo "# Building ${simple_name} (${commit_id})"
         echo "#"
         # Print commands used to install to aid debugging
         set -x
@@ -268,10 +279,11 @@
 mkdir -p ${BUILD_DIR}
 cd ${BUILD_DIR}
 # In dependency order.
-check_and_do ${PROTOBUF_COMMIT} protobuf do_protobuf
-check_and_do ${GRPC_COMMIT} grpc do_grpc
-check_and_do ${PI_COMMIT} p4runtime do_p4runtime
-check_and_do ${BMV2_COMMIT} bmv2 do_bmv2
-check_and_do ${P4C_COMMIT} p4c do_p4c
+check_and_do ${PROTOBUF_COMMIT} protobuf do_protobuf protobuf
+check_and_do ${GRPC_COMMIT} grpc do_grpc grpc
+check_and_do ${BMV2_COMMIT} bmv2 do_pi_bmv2_deps bmv2-deps
+check_and_do ${PI_COMMIT} p4runtime do_p4runtime p4runtime
+check_and_do ${BMV2_COMMIT} bmv2 do_bmv2 bmv2
+check_and_do ${P4C_COMMIT} p4c do_p4c p4c
 
 echo "Done!"