From ce9820fed5a6814142a0f5c79b1147ba445408cd Mon Sep 17 00:00:00 2001 From: James Yonan Date: Wed, 23 May 2012 05:05:42 +0000 Subject: [PATCH] Moved ovpncli.hpp and ovpncli.cpp to client/ so that they can be used by library wrappings other than javacli. --- {javacli => client}/ovpncli.cpp | 0 {javacli => client}/ovpncli.hpp | 0 javacli/build-android | 6 ++++-- javacli/build-android-polar | 6 ++++-- javacli/build-android-pt | 6 ++++-- javacli/build-linux | 6 ++++-- javacli/build-linux-polar | 6 ++++-- sources | 4 ++-- 8 files changed, 22 insertions(+), 12 deletions(-) rename {javacli => client}/ovpncli.cpp (100%) rename {javacli => client}/ovpncli.hpp (100%) diff --git a/javacli/ovpncli.cpp b/client/ovpncli.cpp similarity index 100% rename from javacli/ovpncli.cpp rename to client/ovpncli.cpp diff --git a/javacli/ovpncli.hpp b/client/ovpncli.hpp similarity index 100% rename from javacli/ovpncli.hpp rename to client/ovpncli.hpp diff --git a/javacli/build-android b/javacli/build-android index 7a17cd97..2ef391af 100755 --- a/javacli/build-android +++ b/javacli/build-android @@ -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 \ diff --git a/javacli/build-android-polar b/javacli/build-android-polar index 587425e0..26763737 100755 --- a/javacli/build-android-polar +++ b/javacli/build-android-polar @@ -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 \ diff --git a/javacli/build-android-pt b/javacli/build-android-pt index 7ca194d9..2bcb5ff2 100755 --- a/javacli/build-android-pt +++ b/javacli/build-android-pt @@ -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 \ diff --git a/javacli/build-linux b/javacli/build-linux index 8cf1f409..ff5d51f3 100755 --- a/javacli/build-linux +++ b/javacli/build-linux @@ -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 \ diff --git a/javacli/build-linux-polar b/javacli/build-linux-polar index 15b0a9e9..e92a935b 100755 --- a/javacli/build-linux-polar +++ b/javacli/build-linux-polar @@ -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 \ diff --git a/sources b/sources index eb2cbea4..2f579c63 100755 --- a/sources +++ b/sources @@ -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