diff options
Diffstat (limited to 'main/misc')
-rwxr-xr-x | main/misc/build-native.sh | 57 | ||||
-rwxr-xr-x | main/misc/fetchtranslations.sh | 4 | ||||
-rwxr-xr-x | main/misc/genFAQ.py | 2 |
3 files changed, 4 insertions, 59 deletions
diff --git a/main/misc/build-native.sh b/main/misc/build-native.sh deleted file mode 100755 index 75706e21..00000000 --- a/main/misc/build-native.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -# Exit on errors -set -e - -# Generate git config if the openvpn directory is checked out from git -if [ -e openvpn/.git ]; then - GIT=git - cd openvpn - CONFIGURE_GIT_CHFILES=$($GIT diff-files --name-status -r --ignore-submodules --quiet -- || echo "+") - CONFIGURE_GIT_UNCOMMITTED=$($GIT diff-index --cached --quiet --ignore-submodules HEAD || echo "*") - CONFIGURE_GIT_REVISION=$($GIT rev-parse --symbolic-full-name HEAD | cut -d/ -f3)-$($GIT rev-parse --short=16 HEAD) - echo "#define CONFIGURE_GIT_REVISION \"${CONFIGURE_GIT_REVISION}\"" > config-version.h.tmp; \ - echo "#define CONFIGURE_GIT_FLAGS \"${CONFIGURE_GIT_CHFILES}${CONFIGURE_GIT_UNCOMMITTED}\"" >> config-version.h.tmp - - if ! [ -f config-version.h ] || ! cmp -s config-version.h.tmp config-version.h; then \ - echo "replacing config-version.h" - mv config-version.h.tmp config-version.h - else - rm -f config-version.h.tmp - fi - cd .. -else - echo "Cannot find .git directory in openvpn, aborting" - exit 1 -fi - -if [ "x$1" = "x" ]; then - ndk-build -j 8 USE_BREAKPAD=0 -else - ndk-build $@ -fi - -if [ $? = 0 ]; then - rm -rf ovpnlibs/ - - cd libs - mkdir -p ../ovpnlibs/assets - for i in * - do - cp -v $i/nopie_openvpn ../ovpnlibs/assets/nopie_openvpn.$i - cp -v $i/pie_openvpn ../ovpnlibs/assets/pie_openvpn.$i - done - # Removed compiled openssl libs, will use platform so libs - # Reduces size of apk - # - rm -v */libcrypto.so */libssl.so || true - - for arch in * - do - builddir=../ovpnlibs/jniLibs/$arch - mkdir -p $builddir - cp -v $arch/*.so $builddir - done -else - exit $? -fi diff --git a/main/misc/fetchtranslations.sh b/main/misc/fetchtranslations.sh index b6589ce9..dc56d48e 100755 --- a/main/misc/fetchtranslations.sh +++ b/main/misc/fetchtranslations.sh @@ -5,7 +5,7 @@ if [ "$ICSCROWDAPIKEY" != "" ] then echo "Generating new translation archives" #fetch -q -1 -o - "http://api.crowdin.net/api/project/ics-openvpn/export?key=$ICSCROWDAPIKEY" - curl "http://api.crowdin.net/api/project/ics-openvpn/export?key=$ICSCROWDAPIKEY" + curl "https://api.crowdin.com/api/project/ics-openvpn/export?key=$ICSCROWDAPIKEY" fi echo "Fetch translation archive" @@ -15,7 +15,7 @@ wget -q https://crowdin.com/download/project/ics-openvpn.zip # Chinese language require zh-CN and zh-TW typeset -A langhash -langhash=(zh-CN zh-rCN zh-TW zh-rTW id-ID in ca-ES ca cs-CZ cs et-EE et ja-JP ja ko-KR ko sv-SE sv uk-UA uk vi-VN vi sl-SI sl) +langhash=(zh-CN zh-rCN zh-TW zh-rTW id-ID in ca-ES ca cs-CZ cs et-EE et ja-JP ja ko-KR ko sv-SE sv uk-UA uk vi-VN vi sl-SI sl da-DK da) langtoinclude="de es fr hu it no nl pl pt ro ru tr" diff --git a/main/misc/genFAQ.py b/main/misc/genFAQ.py index d69a5e6b..821e9a4c 100755 --- a/main/misc/genFAQ.py +++ b/main/misc/genFAQ.py @@ -108,6 +108,8 @@ def getVersionString(ver): return "4.4 (Kit Kat)" elif ver == "Build.VERSION_CODES.LOLLIPOP": return "5.0 (Lollipop)" + elif ver == "Build.VERSION_CODES.LOLLIPOP_MR1": + return "5.1 (Lollipop MR1)" else: return "API " + ver |