From f7bcff4ce6e3b74d2286501f946dc37dccdfa96b Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 29 May 2013 22:05:39 +0200 Subject: Move build files to misc directory --HG-- rename : build-native.bat => misc/build-native.bat rename : build-native.sh => misc/build-native.sh rename : fetchtranslations.sh => misc/fetchtranslations.sh --- build-native.bat | 14 -------------- build-native.sh | 21 --------------------- doc/README.txt | 2 +- fetchtranslations.sh | 35 ----------------------------------- misc/build-native.bat | 14 ++++++++++++++ misc/build-native.sh | 21 +++++++++++++++++++++ misc/fetchtranslations.sh | 35 +++++++++++++++++++++++++++++++++++ 7 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 build-native.bat delete mode 100755 build-native.sh delete mode 100755 fetchtranslations.sh create mode 100644 misc/build-native.bat create mode 100755 misc/build-native.sh create mode 100755 misc/fetchtranslations.sh diff --git a/build-native.bat b/build-native.bat deleted file mode 100644 index 2c6303ea..00000000 --- a/build-native.bat +++ /dev/null @@ -1,14 +0,0 @@ -@echo on -call ndk-build -j 8 - -cd libs -mkdir ..\assets - - -for /D %%f in (*) do ( - copy %%f\minivpn ..\assets\minivpn.%%f - del %%f\libcrypto.so - del %%f\libssl.so -) - -cd .. \ No newline at end of file diff --git a/build-native.sh b/build-native.sh deleted file mode 100755 index 72ecd1cb..00000000 --- a/build-native.sh +++ /dev/null @@ -1,21 +0,0 @@ -ndk-build APP_API=all -j 8 -if [ $? = 0 ]; then - rm -rf build/native-libs/ - - cd libs - mkdir -p ../assets - for i in * - do - cp -v $i/minivpn ../assets/minivpn.$i - done - # Removed compiled openssl libs, will use platform so libs - # Reduces size of apk - rm -v */libcrypto.so */libssl.so - - for arch in * - do - builddir=../build/native-libs/$arch - mkdir -p $builddir - cp -v $arch/*.so $builddir - done -fi diff --git a/doc/README.txt b/doc/README.txt index 50424d14..578c48c4 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -13,7 +13,7 @@ svn co http://google-breakpad.googlecode.com/svn/trunk/ google-breakpad - Install ndk (Version 8d gives strange linker errors, use 8b for now) - Make sure that ndk-build is in your build path. -Do ./build-native.(sh|bat) in the root directory of the project. +Do ./misc/build-native.(sh|bat) in the root directory of the project. You may need to refresh the project and clean the project in eclipse to have the libraries included the resulting apk. diff --git a/fetchtranslations.sh b/fetchtranslations.sh deleted file mode 100755 index d0be16cf..00000000 --- a/fetchtranslations.sh +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh - - -if [ "$ICSCROWDAPIKEY" != "" ] -then - echo "Generating new translation archives" - fetch -q -1 -o - http://api.crowdin.net/api/project/ics-openvpn/export?key=$ICSCROWDAPIKEY -fi - -echo "Fetch translation archive" -fetch -q http://crowdin.net/download/project/ics-openvpn.zip - -langtoinclude="ca cs de es et fr id it ja ko no nl ro ru sv uk" - -for lang in $langtoinclude -do - tar xfv ics-openvpn.zip /res/values-$lang/ -done - -# Chinese language require zh-CN and zh-TW - -for lang in zh-CN zh-TW id -do - if [ $lang = "zh-CN" ] ; then - rlang="zh-rCN" - elif [ $lang = "zh-TW" ] ; then - rlang="zh-rTW" - elif [ $lang = "id" ] ; then - rlang="id" - fi - - echo "Fetch archive for $lang" - fetch http://crowdin.net/download/project/ics-openvpn/$lang.zip - tar -xv -C res/values-$rlang/ --strip-components 3 -f $lang.zip -done \ No newline at end of file diff --git a/misc/build-native.bat b/misc/build-native.bat new file mode 100644 index 00000000..2c6303ea --- /dev/null +++ b/misc/build-native.bat @@ -0,0 +1,14 @@ +@echo on +call ndk-build -j 8 + +cd libs +mkdir ..\assets + + +for /D %%f in (*) do ( + copy %%f\minivpn ..\assets\minivpn.%%f + del %%f\libcrypto.so + del %%f\libssl.so +) + +cd .. \ No newline at end of file diff --git a/misc/build-native.sh b/misc/build-native.sh new file mode 100755 index 00000000..72ecd1cb --- /dev/null +++ b/misc/build-native.sh @@ -0,0 +1,21 @@ +ndk-build APP_API=all -j 8 +if [ $? = 0 ]; then + rm -rf build/native-libs/ + + cd libs + mkdir -p ../assets + for i in * + do + cp -v $i/minivpn ../assets/minivpn.$i + done + # Removed compiled openssl libs, will use platform so libs + # Reduces size of apk + rm -v */libcrypto.so */libssl.so + + for arch in * + do + builddir=../build/native-libs/$arch + mkdir -p $builddir + cp -v $arch/*.so $builddir + done +fi diff --git a/misc/fetchtranslations.sh b/misc/fetchtranslations.sh new file mode 100755 index 00000000..d0be16cf --- /dev/null +++ b/misc/fetchtranslations.sh @@ -0,0 +1,35 @@ +#! /bin/sh + + +if [ "$ICSCROWDAPIKEY" != "" ] +then + echo "Generating new translation archives" + fetch -q -1 -o - http://api.crowdin.net/api/project/ics-openvpn/export?key=$ICSCROWDAPIKEY +fi + +echo "Fetch translation archive" +fetch -q http://crowdin.net/download/project/ics-openvpn.zip + +langtoinclude="ca cs de es et fr id it ja ko no nl ro ru sv uk" + +for lang in $langtoinclude +do + tar xfv ics-openvpn.zip /res/values-$lang/ +done + +# Chinese language require zh-CN and zh-TW + +for lang in zh-CN zh-TW id +do + if [ $lang = "zh-CN" ] ; then + rlang="zh-rCN" + elif [ $lang = "zh-TW" ] ; then + rlang="zh-rTW" + elif [ $lang = "id" ] ; then + rlang="id" + fi + + echo "Fetch archive for $lang" + fetch http://crowdin.net/download/project/ics-openvpn/$lang.zip + tar -xv -C res/values-$rlang/ --strip-components 3 -f $lang.zip +done \ No newline at end of file -- cgit v1.2.3