From 1563dca02f33a310b2aad88c24a84488a97f451d Mon Sep 17 00:00:00 2001 From: James Yonan Date: Sat, 6 Jun 2015 13:29:30 -0600 Subject: [PATCH] Added Asio to deps/lib-versions. Removed Snappy dependency as ovpn3 clients now standardize on LZ4 (with LZO-asym fallback). --- deps/asio/build-asio | 14 ++++++++++++++ deps/asio/snapshot-asio | 4 ++++ deps/lib-versions | 4 +--- javacli/build-android | 4 ---- javacli/build-linux | 4 ---- scripts/android/build-all | 12 +++++++----- scripts/linux/build-all | 15 +++++++++++---- scripts/mac/build-all | 15 ++++++++------- test/ovpncli/go | 4 ++-- 9 files changed, 47 insertions(+), 29 deletions(-) create mode 100755 deps/asio/build-asio create mode 100755 deps/asio/snapshot-asio diff --git a/deps/asio/build-asio b/deps/asio/build-asio new file mode 100755 index 00000000..d597690b --- /dev/null +++ b/deps/asio/build-asio @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -e +if [ -z "$O3" ]; then + echo O3 var must point to ovpn3 tree + exit 1 +fi + +[ -z "$DL" ] && DL=~/Downloads + +. $O3/core/deps/lib-versions + +rm -rf asio +tar xf $DL/$ASIO_VERSION.tar.gz diff --git a/deps/asio/snapshot-asio b/deps/asio/snapshot-asio new file mode 100755 index 00000000..550aa5ec --- /dev/null +++ b/deps/asio/snapshot-asio @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +[ "$DEP_DIR" ] && cd $DEP_DIR +[ -z "$DL" ] && DL=~/Downloads +tar cfz $DL/asio-$(date "+%Y%m%d").tar.gz asio diff --git a/deps/lib-versions b/deps/lib-versions index 9b65d93a..43391bc8 100644 --- a/deps/lib-versions +++ b/deps/lib-versions @@ -1,6 +1,4 @@ -export LZO_VERSION=lzo-2.08 +export ASIO_VERSION=asio-20150606 export LZ4_VERSION=lz4-r120 -export SNAPPY_VERSION=snappy-1.1.2 export POLARSSL_VERSION=polarssl-1.3.9a export OPENSSL_VERSION=openssl-1.0.2a - diff --git a/javacli/build-android b/javacli/build-android index 2b2552a9..fd2b1f00 100755 --- a/javacli/build-android +++ b/javacli/build-android @@ -67,14 +67,12 @@ g++ \ $vis1 \ $ssl_def \ -DASIO_STANDALONE \ - -DHAVE_SNAPPY \ -DHAVE_LZ4 \ -I$O3/core/client \ -I$O3/core \ $common \ -I$DEP_DIR/asio/asio/include \ $ssl_inc \ - -I$DEP_DIR/snappy/snappy-$PLATFORM/include \ -I$DEP_DIR/lz4/lz4-$PLATFORM/include \ -c $O3/core/client/ovpncli.cpp @@ -90,7 +88,6 @@ g++ \ -I$O3/core \ $common \ $ssl_libdir \ - -L$DEP_DIR/snappy/snappy-$PLATFORM/lib \ -L$DEP_DIR/lz4/lz4-$PLATFORM/lib \ ovpncli_wrap.cxx \ android/jellybean_hack.cpp \ @@ -99,7 +96,6 @@ g++ \ -o libovpncli.so \ -shared -Wl,-soname,libovpncli.so \ $ssl_lib \ - -lsnappy \ -llz4 \ -llog diff --git a/javacli/build-linux b/javacli/build-linux index 88d71ba2..7d61bf5e 100755 --- a/javacli/build-linux +++ b/javacli/build-linux @@ -59,13 +59,11 @@ g++ \ $vis1 \ $ssl_def \ -DASIO_STANDALONE \ - -DHAVE_SNAPPY \ -DHAVE_LZ4 \ -I$O3/core/client \ -I$O3/core \ -I$DEP_DIR/asio/asio/include \ $ssl_inc \ - -I$DEP_DIR/snappy/snappy-$PLATFORM/include \ -I$DEP_DIR/lz4/lz4-$PLATFORM/include \ -c $O3/core/client/ovpncli.cpp @@ -81,14 +79,12 @@ g++ \ -I$O3/core \ $JINC \ $ssl_libdir \ - -L$DEP_DIR/snappy/snappy-$PLATFORM/lib \ -L$DEP_DIR/lz4/lz4-$PLATFORM/lib \ ovpncli_wrap.cxx \ ovpncli.o \ -o libovpncli.so \ -shared -Wl,-soname,libovpncli.so \ $ssl_lib \ - -lsnappy \ -llz4 if [ "$DEBUG_BUILD" != "1" ]; then diff --git a/scripts/android/build-all b/scripts/android/build-all index 684a4ce7..5a0d0dd9 100755 --- a/scripts/android/build-all +++ b/scripts/android/build-all @@ -6,19 +6,21 @@ if [ -z "$O3" ]; then fi export DEP_DIR=${DEP_DIR:-$HOME/src/android} cd $DEP_DIR -rm -rf boost* lz4* lzo* minicrypto openssl* polarssl* snappy* -#echo "******* BOOST" -#$O3/core/scripts/android/build-boost +rm -rf asio* boost* lz4* lzo* minicrypto openssl* polarssl* snappy* +echo "******* ASIO" +$O3/core/deps/asio/build-asio echo "******* POLARSSL" $O3/core/scripts/android/build-polarssl echo "******* LZ4" $O3/core/scripts/android/build-lz4 -echo "******* SNAPPY" -$O3/core/scripts/android/build-snappy +#echo "******* BOOST" +#$O3/core/scripts/android/build-boost #echo "******* MINICRYPTO" #$O3/core/scripts/android/build-minicrypto #echo "******* OpenSSL" #$O3/core/scripts/android/build-openssl-small #echo "******* LZO" #$O3/core/scripts/android/build-lzo +#echo "******* SNAPPY" +#$O3/core/scripts/android/build-snappy diff --git a/scripts/linux/build-all b/scripts/linux/build-all index 9b59e2e6..f131fddd 100755 --- a/scripts/linux/build-all +++ b/scripts/linux/build-all @@ -5,10 +5,17 @@ if [ -z "$O3" ]; then fi export DEP_DIR=${DEP_DIR:-$HOME/linux} cd $DEP_DIR -#$O3/core/scripts/linux/build-boost -#$O3/core/scripts/linux/build-openssl x64 +rm -rf asio* boost* lz4* lzo* minicrypto openssl* polarssl* snappy* +echo "******* ASIO" +$O3/core/deps/asio/build-asio +echo "******* POLARSSL" $O3/core/scripts/linux/build-polarssl -$O3/core/scripts/linux/build-snappy +echo "******* OpenSSL" +$O3/core/scripts/linux/build-openssl x64 +echo "******* LZ4" $O3/core/scripts/linux/build-lz4 -$O3/core/scripts/linux/build-lzo + +#$O3/core/scripts/linux/build-lzo +#$O3/core/scripts/linux/build-boost +#$O3/core/scripts/linux/build-snappy #$O3/core/scripts/linux/consolidate-so diff --git a/scripts/mac/build-all b/scripts/mac/build-all index b3fb54be..68ad36c8 100755 --- a/scripts/mac/build-all +++ b/scripts/mac/build-all @@ -5,16 +5,17 @@ if [ -z "$O3" ]; then echo O3 var must point to ovpn3 tree ; exit 1 fi cd $DEP_DIR -rm -rf boost* lz4* lzo* minicrypto openssl* polarssl* snappy* -#echo "******* BOOST" -#$O3/core/scripts/mac/build-boost -#echo "******* MINICRYPTO" -#$O3/core/scripts/mac/build-minicrypto +rm -rf asio* boost* lz4* lzo* minicrypto openssl* polarssl* snappy* +echo "******* ASIO" +$O3/core/deps/asio/build-asio echo "******* POLARSSL" # consider OSX_SERVER=0 $O3/core/scripts/mac/build-polarssl -echo "******* SNAPPY" -$O3/core/scripts/mac/build-snappy echo "******* LZ4" $O3/core/scripts/mac/build-lz4 exit 0 + +#echo "******* MINICRYPTO" +#$O3/core/scripts/mac/build-minicrypto +#echo "******* SNAPPY" +#$O3/core/scripts/mac/build-snappy diff --git a/test/ovpncli/go b/test/ovpncli/go index 74ce44af..e34e18e7 100755 --- a/test/ovpncli/go +++ b/test/ovpncli/go @@ -9,11 +9,11 @@ if [ "$(uname)" == "Darwin" ]; then . vars/vars-osx64 . vars/setpath cd test/ovpncli - PSSL=1 SNAP=1 LZ4=1 PTPROXY=1 build cli 2>&1 + PSSL=1 LZ4=1 PTPROXY=1 build cli 2>&1 else cd $O3/core . vars/vars-linux . vars/setpath cd test/ovpncli - PSSL=1 SNAP=1 LZ4=1 NOSSL=1 PTPROXY=1 build cli 2>&1 + PSSL=1 LZ4=1 NOSSL=1 PTPROXY=1 build cli 2>&1 fi