Adjusting scripts to fake-install.

pull/1417/head
Nicolas "Pixel" Noble 10 years ago
parent f173793e51
commit 9adbf48970
  1. 4
      .travis.yml
  2. 31
      tools/run_tests/prepare_travis.sh

@ -15,8 +15,6 @@ env:
- RUBY_VERSION=2.1 - RUBY_VERSION=2.1
- COVERALLS_PARALLEL=true - COVERALLS_PARALLEL=true
- CPPFLAGS=-I/tmp/prebuilt/include - CPPFLAGS=-I/tmp/prebuilt/include
- LDFLAGS=-L/tmp/prebuilt/lib
- PATH=/tmp/prebuilt/bin:$PATH
- NUGET="mono nuget.exe" - NUGET="mono nuget.exe"
matrix: matrix:
- CONFIG=opt TEST=sanity - CONFIG=opt TEST=sanity
@ -35,7 +33,7 @@ env:
script: script:
- rvm use $RUBY_VERSION - rvm use $RUBY_VERSION
- gem install bundler - 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 - 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 - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0
after_success: after_success:

@ -1,14 +1,39 @@
#!/bin/sh #!/bin/bash
cd `dirname $0`/../.. cd `dirname $0`/../..
grpc_dir=`pwd` grpc_dir=`pwd`
distrib=`md5sum /etc/issue | cut -f1 -d\ ` distrib=`md5sum /etc/issue | cut -f1 -d\ `
echo "Configuring for disbribution $distrib"
git submodule | while read sha path extra ; do git submodule | while read sha path extra ; do
cd /tmp cd /tmp
name=`basename $path` name=`basename $path`
file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz
echo $file echo -n "$file ..."
url=http://storage.googleapis.com/grpc-prebuilt-packages/$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 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

Loading…
Cancel
Save