Merge commit 'f65d76170b26155358c2fc27686f87e0475f6a94' as 'OpenVPN Adapter/Vendors/openvpn'

OpenVPN Adapter/Vendors/openvpn/vars/android-sdk-path

@@ -0,0 +1,7 @@
+# setup PATH for Android SDK and NDK
+AD=$HOME/src/android
+export SDK=$AD/android-sdk-macosx
+export NDK=$AD/android-ndk-r10d
+if [ "$NO_MOD_PATH" != "1" ]; then
+   export PATH="$SDK/tools:$SDK/platform-tools:$PATH"
+fi

OpenVPN Adapter/Vendors/openvpn/vars/o3

@@ -0,0 +1 @@
+export O3="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"

OpenVPN Adapter/Vendors/openvpn/vars/setlibpath

@@ -0,0 +1 @@
+export LD_LIBRARY_PATH=".:$DEP_DIR/so"

OpenVPN Adapter/Vendors/openvpn/vars/setpath

@@ -0,0 +1 @@
+export PATH="$O3/core/scripts:$PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-android

@@ -0,0 +1,13 @@
+export DEP_DIR=$HOME/src/android
+export PLATFORM=android
+export ABI=armeabi
+export DEBUG_BUILD=0
+export OTHER_COMPILER_FLAGS=""
+export CXX_COMPILER_FLAGS="-std=c++11"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC="-fPIC"
+export TC=$DEP_DIR/tc-arm
+export PLATFORM_FLAGS="--sysroot=$TC/sysroot"
+
+[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
+export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-android-a7a

@@ -0,0 +1,13 @@
+export DEP_DIR=$HOME/src/android
+export PLATFORM=android-a7a
+export ABI=armeabi-v7a
+export DEBUG_BUILD=0
+export OTHER_COMPILER_FLAGS=""
+export CXX_COMPILER_FLAGS="-std=c++11"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC="-fPIC"
+export TC=$DEP_DIR/tc-arm
+export PLATFORM_FLAGS="-march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot"
+
+[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
+export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-android-a7a-dbg

@@ -0,0 +1,13 @@
+export DEP_DIR=$HOME/src/android
+export PLATFORM=android-a7a-dbg
+export ABI=armeabi-v7a
+export DEBUG_BUILD=1
+export OTHER_COMPILER_FLAGS="-g"
+export CXX_COMPILER_FLAGS="-std=c++11"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC="-fPIC"
+export TC=$DEP_DIR/tc-arm
+export PLATFORM_FLAGS="-march=armv7-a -mthumb -fomit-frame-pointer --sysroot=$TC/sysroot"
+
+[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
+export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-android-a8a

@@ -0,0 +1,13 @@
+export DEP_DIR=$HOME/src/android
+export PLATFORM=android-a8a
+export ABI=arm64-v8a
+export DEBUG_BUILD=0
+export OTHER_COMPILER_FLAGS=""
+export CXX_COMPILER_FLAGS="-std=c++1y"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC="-fPIC"
+export TC=$DEP_DIR/tc-arm64
+export PLATFORM_FLAGS="-march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot"
+
+[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
+export PATH="$TC/bin:$TC/aarch64-linux-android/bin:$VARS_SAVE_PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-android-a8a-dbg

@@ -0,0 +1,13 @@
+export DEP_DIR=$HOME/src/android
+export PLATFORM=android-a8a-dbg
+export ABI=arm64-v8a
+export DEBUG_BUILD=1
+export OTHER_COMPILER_FLAGS="-g"
+export CXX_COMPILER_FLAGS="-std=c++1y"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC="-fPIC"
+export TC=$DEP_DIR/tc-arm64
+export PLATFORM_FLAGS="-march=armv8-a -fomit-frame-pointer --sysroot=$TC/sysroot"
+
+[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
+export PATH="$TC/bin:$TC/aarch64-linux-android/bin:$VARS_SAVE_PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-android-dbg

@@ -0,0 +1,13 @@
+export DEP_DIR=$HOME/src/android
+export PLATFORM=android-dbg
+export ABI=armeabi
+export DEBUG_BUILD=1
+export OTHER_COMPILER_FLAGS="-g"
+export CXX_COMPILER_FLAGS="-std=c++11"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC="-fPIC"
+export TC=$DEP_DIR/tc-arm
+export PLATFORM_FLAGS="--sysroot=$TC/sysroot"
+
+[ -z "$VARS_SAVE_PATH" ] && VARS_SAVE_PATH="$PATH"
+export PATH="$TC/bin:$TC/arm-linux-androideabi/bin:$VARS_SAVE_PATH"

OpenVPN Adapter/Vendors/openvpn/vars/vars-arm-cross

@@ -0,0 +1,5 @@
+export PLATFORM=linux-arm
+export GPP_CMD=arm-linux-gnueabi-g++-4.6
+export STRIP_CMD=arm-linux-gnueabi-strip
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC="-fPIC"

OpenVPN Adapter/Vendors/openvpn/vars/vars-ios

@@ -0,0 +1,10 @@
+export PLATFORM=ios
+export APPLE_FAMILY=1
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
+export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=5.1.1 -isysroot $IOS_SDK"
+export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-ios-dbg

@@ -0,0 +1,11 @@
+export PLATFORM=ios-dbg
+export APPLE_FAMILY=1
+export DEBUG_BUILD=1
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
+export PLATFORM_FLAGS="-arch armv7 -arch armv7s -arch arm64 -mthumb -miphoneos-version-min=5.1.1 -isysroot $IOS_SDK"
+export OTHER_COMPILER_FLAGS="-g"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-iossim

@@ -0,0 +1,10 @@
+export PLATFORM=iossim
+export APPLE_FAMILY=1
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
+export PLATFORM_FLAGS="-arch i386 -arch x86_64 -miphoneos-version-min=5.1.1 -isysroot $IOS_SDK"
+export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-iossim-dbg

@@ -0,0 +1,11 @@
+export PLATFORM=iossim-dbg
+export DEBUG_BUILD=1
+export APPLE_FAMILY=1
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export IOS_SDK="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
+export PLATFORM_FLAGS="-arch i386 -arch x86_64 -miphoneos-version-min=5.1.1 -isysroot $IOS_SDK"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export OTHER_COMPILER_FLAGS="-g"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-linux

@@ -0,0 +1,13 @@
+export JAVA_DIR=/usr/lib/jvm/java-7-openjdk-amd64
+[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/linux
+export PLATFORM=linux
+export DEBUG_BUILD=0
+LTO_FLAGS="-flto=4 -Wl,--no-as-needed" # add to OTHER_COMPILER_FLAGS for LTO
+export OTHER_COMPILER_FLAGS="$LTO_FLAGS -Wno-unused-local-typedefs -Wno-unused-variable -Wno-shift-count-overflow -pthread"
+export CXX_COMPILER_FLAGS="-std=c++14"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC="-fPIC"
+export GPP_CMD=g++
+export GCC_CMD=gcc
+export AR_CMD=gcc-ar
+export RANLIB_CMD=gcc-ranlib

OpenVPN Adapter/Vendors/openvpn/vars/vars-linux-dbg

@@ -0,0 +1,12 @@
+export JAVA_DIR=/usr/lib/jvm/java-7-openjdk-amd64
+[ -z "$DEP_DIR" ] && export DEP_DIR=$HOME/linux
+export PLATFORM=linux
+export DEBUG_BUILD=1
+export OTHER_COMPILER_FLAGS="-g -Wno-unused-local-typedefs -Wno-unused-variable -Wno-shift-count-overflow -pthread"
+export CXX_COMPILER_FLAGS="-std=c++14"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC="-fPIC"
+export GPP_CMD=g++-5
+export GCC_CMD=gcc-5
+export AR_CMD=gcc-ar-5
+export RANLIB_CMD=gcc-ranlib-5

OpenVPN Adapter/Vendors/openvpn/vars/vars-osx

@@ -0,0 +1,12 @@
+export PLATFORM=osx
+export DEP_DIR=$HOME/src/mac
+export APPLE_FAMILY=1
+export DEBUG_BUILD=0
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.8"
+export PLATFORM_FLAGS="-arch x86_64 -arch i386 $MIN_DEPLOY_TARGET"
+export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-osx-dbg

@@ -0,0 +1,12 @@
+export PLATFORM=osx-dbg
+export DEP_DIR=$HOME/src/mac
+export APPLE_FAMILY=1
+export DEBUG_BUILD=1
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.8"
+export PLATFORM_FLAGS="-arch x86_64 -arch i386 $MIN_DEPLOY_TARGET"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export OTHER_COMPILER_FLAGS="-g"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-osx64

@@ -0,0 +1,12 @@
+export PLATFORM=osx
+export DEP_DIR=$HOME/src/mac
+export APPLE_FAMILY=1
+export DEBUG_BUILD=0
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.8"
+export PLATFORM_FLAGS="-arch x86_64 $MIN_DEPLOY_TARGET"
+export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export LIB_OPT_LEVEL="-O3"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-osx64-dbg

@@ -0,0 +1,12 @@
+export PLATFORM=osx-dbg
+export DEP_DIR=$HOME/src/mac
+export APPLE_FAMILY=1
+export DEBUG_BUILD=1
+export GPP_CMD=clang++
+export GCC_CMD=clang
+export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.8"
+export PLATFORM_FLAGS="-arch x86_64 $MIN_DEPLOY_TARGET"
+export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"
+export OTHER_COMPILER_FLAGS="-g"
+export LIB_OPT_LEVEL="-O0"
+export LIB_FPIC=""

OpenVPN Adapter/Vendors/openvpn/vars/vars-reset

@@ -0,0 +1,21 @@
+unset PLATFORM
+unset PLATFORM_FLAGS
+unset MIN_DEPLOY_TARGET
+unset OTHER_COMPILER_FLAGS
+unset IOS_SDK
+unset BOOST_DIR
+unset BOOST_STAGE
+unset OPENSSL_DIR
+unset SNAPPY_DIR
+unset LZ4_DIR
+unset JAVA_DIR
+unset GPP_CMD
+unset GCC_CMD
+unset STRIP_CMD
+unset LD_LIBRARY_PATH
+unset APPLE_FAMILY
+unset LIB_OPT_LEVEL
+unset LIB_FPIC
+unset DEBUG_BUILD
+unset LINK_MODE
+unset CXX_COMPILER_FLAGS

OpenVPN Adapter/Vendors/openvpn/vars/vars-win

@@ -0,0 +1 @@
+alias build="python ~/ovpn3/win/build.py"