From 9adbf489707ce7eee4307d3540a61950aa633fad Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Thu, 30 Apr 2015 02:26:51 +0200
Subject: Adjusting scripts to fake-install.

---
 .travis.yml                       |  4 +---
 tools/run_tests/prepare_travis.sh | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23cb0a09b2..0f6acbf003 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,6 @@ env:
     - RUBY_VERSION=2.1
     - COVERALLS_PARALLEL=true
     - CPPFLAGS=-I/tmp/prebuilt/include
-    - LDFLAGS=-L/tmp/prebuilt/lib
-    - PATH=/tmp/prebuilt/bin:$PATH
     - NUGET="mono nuget.exe"
   matrix:
     - CONFIG=opt TEST=sanity
@@ -35,7 +33,7 @@ env:
 script:
   - rvm use $RUBY_VERSION
   - gem install bundler
-  - ./tools/run_tests/prepare_travis.sh
+  - if [ -z "$USE_GCC" ] ; then ./tools/run_tests/prepare_travis.sh ; fi
   - if [ ! -z "$USE_GCC" ] ; then export CC=gcc-$USE_GCC ; export CXX=g++-$USE_GCC ; fi
   - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0
 after_success:
diff --git a/tools/run_tests/prepare_travis.sh b/tools/run_tests/prepare_travis.sh
index 2be86270dd..a8ddc578d5 100755
--- a/tools/run_tests/prepare_travis.sh
+++ b/tools/run_tests/prepare_travis.sh
@@ -1,14 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 cd `dirname $0`/../..
 grpc_dir=`pwd`
 
 distrib=`md5sum /etc/issue | cut -f1 -d\ `
+echo "Configuring for disbribution $distrib"
 git submodule | while read sha path extra ; do
   cd /tmp
   name=`basename $path`
   file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz
-  echo $file
+  echo -n "$file ..."
   url=http://storage.googleapis.com/grpc-prebuilt-packages/$file
-  wget -q $url && tar xfz $file || true
+  wget -q $url && (
+    echo " Found."
+    tar xfz $file
+  ) || true
 done
+
+mkdir -p bins/$CONFIG/protobuf
+mkdir -p libs/$CONFIG/protobuf
+mkdir -p libs/$CONFIG/openssl
+
+function cpt {
+  cp /tmp/prebuilt/$1 $2/$CONFIG/$3
+  touch $2/$CONFIG/$3/`basename $1`
+}
+
+if [ -e /tmp/prebuilt/bin/protoc ] ; then
+  touch third_party/protobuf/configure
+  cpt bin/protoc bins protobuf
+  cpt lib/libprotoc.a libs protobuf
+  cpt lib/libprotobuf.a libs protobuf
+fi
+
+if [ -e /tmp/prebuilt/lib/libssl.a ] ; then
+  cpt lib/libcrypto.a libs openssl
+  cpt lib/libssl.a libs openssl
+fi
-- 
cgit v1.2.3