From 882d7a7eec148046a90e1d111b93e353e3df0c31 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Tue, 24 Mar 2015 23:26:32 +0100
Subject: Adding pre-built packages for OpenSSL and protobuf for Travis.

---
 .travis.yml                       |  4 ++++
 tools/run_tests/prepare_travis.sh | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100755 tools/run_tests/prepare_travis.sh

diff --git a/.travis.yml b/.travis.yml
index e43a89e453..d6d67d415c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,9 @@ env:
   global:
     - RUBY_VERSION=2.1
     - COVERALLS_PARALLEL=true
+    - CPPFLAGS=-I/tmp/prebuilt/include
+    - LDFLAGS=-L/tmp/prebuilt/lib
+    - PATH=/tmp/prebuilt/bin:$PATH
   matrix:
     - CONFIG=dbg TEST=c
     - CONFIG=dbg TEST=c++
@@ -22,6 +25,7 @@ env:
 script:
   - rvm use $RUBY_VERSION
   - gem install bundler
+  - ./tools/run_tests/prepare_travis.sh
   - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0
 after_success:
   - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens -b. --gcov-options '\-p' ; fi
diff --git a/tools/run_tests/prepare_travis.sh b/tools/run_tests/prepare_travis.sh
new file mode 100755
index 0000000000..2be86270dd
--- /dev/null
+++ b/tools/run_tests/prepare_travis.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+cd `dirname $0`/../..
+grpc_dir=`pwd`
+
+distrib=`md5sum /etc/issue | cut -f1 -d\ `
+git submodule | while read sha path extra ; do
+  cd /tmp
+  name=`basename $path`
+  file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz
+  echo $file
+  url=http://storage.googleapis.com/grpc-prebuilt-packages/$file
+  wget -q $url && tar xfz $file || true
+done
-- 
cgit v1.2.3


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


From f0668c83bbdfb6b942d1ae7b7f650c07930e3c68 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Thu, 30 Apr 2015 07:01:31 +0200
Subject: Alright, fine Travis. You can try and build for another version of
 gcc.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0f6acbf003..dfe0441abc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ env:
 script:
   - rvm use $RUBY_VERSION
   - gem install bundler
-  - if [ -z "$USE_GCC" ] ; then ./tools/run_tests/prepare_travis.sh ; fi
+  - ./tools/run_tests/prepare_travis.sh
   - 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:
-- 
cgit v1.2.3