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

Moved ovpncli.hpp and ovpncli.cpp to client/ so that they can be used

Browse Source 
by library wrappings other than javacli.
This commit is contained in:
James Yonan 2012-05-23 05:05:42 +00:00
parent dafe931877
commit ce9820fed5
8 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
javacli/ovpncli.cpp → client/ovpncli.cpp
View File

0
javacli/ovpncli.hpp → client/ovpncli.hpp
View File

6
javacli/build-android
View File

@ -3,7 +3,7 @@
set -e
echo SWIG
swig -c++ -java -package net.openvpn.openvpn -I$OVPN3_DIR ovpncli.i
swig -c++ -java -package net.openvpn.openvpn -I$OVPN3_DIR/client -I$OVPN3_DIR ovpncli.i
echo CORE
$GPP_CMD \
@ -16,10 +16,11 @@ $GPP_CMD \
-D__GLIBC__ \
-D_GLIBCXX_HAVE_FENV_H=1 \
-DBOOST_NO_INTRINSIC_WCHAR_T \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I$BOOST_DIR \
-I$OPENSSL_DIR/include \
-c ovpncli.cpp
-c $OVPN3_DIR/client/ovpncli.cpp
echo WRAP
$GPP_CMD \
@ -30,6 +31,7 @@ $GPP_CMD \
-fvisibility=hidden '-DSWIGEXPORT=__attribute__((visibility("default")))' \
-D__GLIBC__ \
-D_GLIBCXX_HAVE_FENV_H=1 \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-L$BOOST_DIR/stage/lib \
-L$OPENSSL_DIR/lib \

6
javacli/build-android-polar
View File

@ -3,7 +3,7 @@
set -e
echo SWIG
swig -c++ -java -package net.openvpn.openvpn -I$OVPN3_DIR ovpncli.i
swig -c++ -java -package net.openvpn.openvpn -I$OVPN3_DIR/client -I$OVPN3_DIR ovpncli.i
echo CORE
$GPP_CMD \
@ -15,10 +15,11 @@ $GPP_CMD \
-D__GLIBC__ \
-D_GLIBCXX_HAVE_FENV_H=1 \
-DBOOST_NO_INTRINSIC_WCHAR_T \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I$BOOST_DIR \
-I$POLARSSL_DIR/include \
-c ovpncli.cpp
-c $OVPN3_DIR/client/ovpncli.cpp
echo WRAP
$GPP_CMD \
@ -29,6 +30,7 @@ $GPP_CMD \
-fvisibility=hidden '-DSWIGEXPORT=__attribute__((visibility("default")))' \
-D__GLIBC__ \
-D_GLIBCXX_HAVE_FENV_H=1 \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-L$BOOST_DIR/stage/lib \
-L$POLARSSL_DIR/library \

6
javacli/build-android-pt
View File

@ -6,7 +6,7 @@ rm -rf pt
mkdir pt
echo SWIG
swig -c++ -java -package net.openvpn.privatetunnel -I$OVPN3_DIR ovpncli.i
swig -c++ -java -package net.openvpn.privatetunnel -I$OVPN3_DIR/client -I$OVPN3_DIR ovpncli.i
echo CORE
$GPP_CMD \
@ -19,10 +19,11 @@ $GPP_CMD \
-D__GLIBC__ \
-D_GLIBCXX_HAVE_FENV_H=1 \
-DBOOST_NO_INTRINSIC_WCHAR_T \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I$BOOST_DIR \
-I$OPENSSL_DIR/include \
-c ovpncli.cpp
-c $OVPN3_DIR/client/ovpncli.cpp
echo WRAP
$GPP_CMD \
@ -33,6 +34,7 @@ $GPP_CMD \
-fvisibility=hidden '-DSWIGEXPORT=__attribute__((visibility("default")))' \
-D__GLIBC__ \
-D_GLIBCXX_HAVE_FENV_H=1 \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-L$BOOST_DIR/stage/lib \
-L$OPENSSL_DIR/lib \

6
javacli/build-linux
View File

@ -2,7 +2,7 @@
set -e
echo SWIG
swig -c++ -java -I$OVPN3_DIR ovpncli.i
swig -c++ -java -I$OVPN3_DIR/client -I$OVPN3_DIR ovpncli.i
echo JAVA
javac *.java
@ -12,15 +12,17 @@ gcc -O3 -fPIC -pthread \
-Wall -Wno-sign-compare -Wno-unused-parameter \
-fvisibility=hidden \
-DUSE_OPENSSL \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I$BOOST_DIR \
-c ovpncli.cpp
-c $OVPN3_DIR/client/ovpncli.cpp
echo WRAP
gcc -Os -fPIC -pthread \
-fno-strict-aliasing \
-Wall \
-fvisibility=hidden '-DSWIGEXPORT=__attribute__((visibility("default")))' \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I/usr/lib/jvm/java-7-openjdk-amd64/include \
-L$BOOST_DIR/stage/lib \

6
javacli/build-linux-polar
View File

@ -2,7 +2,7 @@
set -e
echo SWIG
swig -c++ -java -I$OVPN3_DIR ovpncli.i
swig -c++ -java -I$OVPN3_DIR/client -I$OVPN3_DIR ovpncli.i
echo JAVA
javac *.java
@ -12,16 +12,18 @@ gcc -O3 -fPIC -pthread \
-Wall -Wno-sign-compare -Wno-unused-parameter \
-fvisibility=hidden \
-DUSE_POLARSSL \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I$BOOST_DIR \
-I$POLARSSL_DIR/include \
-c ovpncli.cpp
-c $OVPN3_DIR/client/ovpncli.cpp
echo WRAP
gcc -Os -fPIC -pthread \
-fno-strict-aliasing \
-Wall \
-fvisibility=hidden '-DSWIGEXPORT=__attribute__((visibility("default")))' \
-I$OVPN3_DIR/client \
-I$OVPN3_DIR \
-I/usr/lib/jvm/java-7-openjdk-amd64/include \
-L$BOOST_DIR/stage/lib \

4
sources
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash
top=$(pwd)
find openvpn | grep -E '\.(cpp|hpp|c|h)$'
echo javacli/ovpncli.hpp
echo javacli/ovpncli.cpp
echo client/ovpncli.hpp
echo client/ovpncli.cpp
echo javacli/OpenVPNClientThread.java
android=android/OpenVPN/src/net/openvpn/openvpn
cd $android