Clean up vpp build bootstrap step

[vpp.git] / build-root / bootstrap.sh

diff --git a/build-root/bootstrap.sh b/build-root/bootstrap.sh
index f83734f..c3b355b 100755 (executable)
--- a/build-root/bootstrap.sh
+++ b/build-root/bootstrap.sh
@@ -1,5 +1,18 @@
 #!/bin/bash
 
+# Copyright (c) 2015 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 build_root=`pwd`
 cd ../
 wsroot=`pwd`
@@ -25,28 +38,22 @@ EOF
 
 # regenerate tools/ccache-bin
 rm -rf tools/ccache-bin
-mkdir -p tools/ccache-bin
+mkdir -p tools/ccache-bin tools/bin
 
 if [ ! -f /usr/bin/ccache ] ; then
-    echo Please install ccache AYEC and re-run this script
+    echo CCACHE is required. Please install it!
+    exit 1
 fi
 
 cd tools/ccache-bin
-for c in gcc g++
-    do
-    if [ -f /usr/bin/ccache ] ; then
-        ln -s /usr/bin/ccache $c
-    else
-        ln -s /usr/bin/gcc
-    fi
+for c in gcc g++ clang clang++
+do
+    ln -s /usr/bin/ccache $c
 done
-
-cd $wsroot
+cd ../
+ln -s $wsroot/src/tools/vppapigen/vppapigen  \
+      $build_root/tools/bin/vppapigen
 
 cd $build_root
-echo Compile native tools
-for tool in vppapigen
-do
-    make V=0 is_build_tool=yes $tool-install
-done
 
+exit 0