From e2d191063820078150389a5a992270455ea72b6a Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 24 May 2019 19:37:20 +0200 Subject: add missing pieces to build shapeshifter-dispatcher on CI --- build_deps.sh | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) (limited to 'build_deps.sh') diff --git a/build_deps.sh b/build_deps.sh index 023baed5..52ba7e56 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -1,22 +1,38 @@ #!/bin/bash function quit { - echo "Task failed. Exit value: $?." + echo "Task failed. $1." exit 1 } DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj +DIR_GOLANG=./go/golang/ +DIR_SHAPESHIFTER_DISPATCHER=./go/src/ +FILE_X86=./go/out/x86/piedispatcher +FILE_ARM=./go/out/armeabi-v7a/piedispatcher + # init -# look for empty dir +# look for empty dir if [[ $(ls -A ${DIR_OVPNASSETS}) && $(ls -A ${DIR_OVPNLIBS}) ]] then echo "Dirty build: skipped externalNativeBuild - reusing existing libs" else - echo "Clean build: starting externalNativeBuild" - cd ./ics-openvpn || quit - ./gradlew clean main:externalNativeBuildCleanNoovpn3Release main:externalNativeBuildNoovpn3Release --debug --stacktrace || quit - cd .. -fi \ No newline at end of file + echo "Clean build: starting externalNativeBuild and GO dependency builds" + cd ./ics-openvpn || quit "Directory ics-opevpn not found" + ./gradlew clean main:externalNativeBuildCleanNoovpn3Release main:externalNativeBuildNoovpn3Release --debug --stacktrace || quit "Build ics-openvpn native libraries failed" + cd .. +fi + +if [[ $(ls -A ${FILE_X86}) && $(ls -A ${FILE_ARM}) ]] +then + echo "Dirty build: Reusing go libraries" +else + echo "Clean build: compiling Go libraries" + cd ./go || quit "Directory go not found" + ./android_build_shapeshifter_dispatcher.sh clean || quit "android_build_shapeshifter_dispatcher.sh clean failed" + ./install_go.sh || quit "install_go.sh failed" + ./android_build_shapeshifter_dispatcher.sh || quit "android_build_shapeshifter_dispatcher.sh failed" +fi -- cgit v1.2.3 From 7f8a7585c53321aa72410f72876aa68101d228dc Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 19 Jul 2019 17:43:31 +0200 Subject: update build_deps.sh: build shapeshifter library instead of shapeshifter-dispatcher --- build_deps.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build_deps.sh') diff --git a/build_deps.sh b/build_deps.sh index 52ba7e56..b95475a3 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -10,8 +10,8 @@ DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj DIR_GOLANG=./go/golang/ DIR_SHAPESHIFTER_DISPATCHER=./go/src/ -FILE_X86=./go/out/x86/piedispatcher -FILE_ARM=./go/out/armeabi-v7a/piedispatcher +FILE_X86=./go/out/x86/piedispatcherlib +FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib # init # look for empty dir @@ -32,7 +32,7 @@ then else echo "Clean build: compiling Go libraries" cd ./go || quit "Directory go not found" - ./android_build_shapeshifter_dispatcher.sh clean || quit "android_build_shapeshifter_dispatcher.sh clean failed" + ./android_build_shapeshifter.sh clean || quit "android_build_shapeshifter_dispatcher.sh clean failed" ./install_go.sh || quit "install_go.sh failed" - ./android_build_shapeshifter_dispatcher.sh || quit "android_build_shapeshifter_dispatcher.sh failed" + ./android_build_shapeshifter.sh --library || quit "android_build_shapeshifter_dispatcher.sh failed" fi -- cgit v1.2.3 From 8d0a10f8ca92de4766aee8d41f3e235590c3a848 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jul 2019 18:49:52 +0200 Subject: update shapeshifter lib build script using gomobile --- build_deps.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'build_deps.sh') diff --git a/build_deps.sh b/build_deps.sh index b95475a3..7f0c8e89 100755 --- a/build_deps.sh +++ b/build_deps.sh @@ -8,8 +8,7 @@ function quit { DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/noovpn3/release/obj -DIR_GOLANG=./go/golang/ -DIR_SHAPESHIFTER_DISPATCHER=./go/src/ +DIR_GOLIBS=./go/lib/ FILE_X86=./go/out/x86/piedispatcherlib FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib @@ -26,13 +25,13 @@ else cd .. fi -if [[ $(ls -A ${FILE_X86}) && $(ls -A ${FILE_ARM}) ]] +if [[ $(ls -A ${DIR_GOLIBS}) ]] then echo "Dirty build: Reusing go libraries" else echo "Clean build: compiling Go libraries" cd ./go || quit "Directory go not found" - ./android_build_shapeshifter.sh clean || quit "android_build_shapeshifter_dispatcher.sh clean failed" ./install_go.sh || quit "install_go.sh failed" - ./android_build_shapeshifter.sh --library || quit "android_build_shapeshifter_dispatcher.sh failed" + ./android_build_shapeshifter_lib.sh || quit "android_build_shapeshifter_dispatcher.sh failed" + cd .. fi -- cgit v1.2.3