mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-19 19:52:15 +02:00
Code

Added Asio to deps/lib-versions.

Browse Source 
Removed Snappy dependency as ovpn3 clients now
standardize on LZ4 (with LZO-asym fallback).
This commit is contained in:
James Yonan 2015-06-06 13:29:30 -06:00
parent c6a21c827b
commit 1563dca02f
9 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/asio/build-asio vendored Executable file
View File

@ -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

4
deps/asio/snapshot-asio vendored Executable file
View File

@ -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

4
deps/lib-versions vendored
View File

@ -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

4
javacli/build-android
View File

@ -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

4
javacli/build-linux
View File

@ -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

12
scripts/android/build-all
View File

@ -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

15
scripts/linux/build-all
View File

@ -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

15
scripts/mac/build-all
View File

@ -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

4
test/ovpncli/go
View File

@ -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