diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_deps.sh | 6 | ||||
| -rwxr-xr-x | scripts/cleanProject.sh | 17 | ||||
| -rwxr-xr-x | scripts/prepareForScreenshots.sh | 2 | ||||
| -rwxr-xr-x | scripts/prepareForTests.sh | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index 51cc926d..dd75ccae 100755 --- a/scripts/build_deps.sh +++ b/scripts/build_deps.sh @@ -9,7 +9,7 @@ SCRIPT_DIR=$(dirname "$0") BASE_DIR="$SCRIPT_DIR/.." DIR_OVPNASSETS=./ics-openvpn/main/build/ovpnassets DIR_OVPNLIBS=./ics-openvpn/main/build/intermediates/cmake/skeletonRelease/obj -DIR_GOLIBS=./bitmaskcore/lib/ +DIR_GOLIBS=./bitmask-core-android/lib/ #FILE_X86=./go/out/x86/piedispatcherlib #FILE_ARM=./go/out/armeabi-v7a/piedispatcherlib DIR_TORLIBS=./tor-android/external/lib @@ -82,12 +82,12 @@ then echo "Dirty build: Reusing go libraries" else echo "Clean build: compiling Go libraries" - cd ./bitmaskcore || quit "Directory go not found" + cd ./bitmask-core-android || quit "Directory go not found" if [[ ! -d lib ]] then mkdir lib fi - ./build_core.sh || quit "failed to build bitmaskcore" + ./build_core.sh || quit "Failed to build Bitmask Core Android" cp lib/bitmaskcore.aar ../lib-bitmask-core/. cp lib/bitmaskcore-sources.jar ../lib-bitmask-core/. cp lib/bitmaskcore_web.aar ../lib-bitmask-core-web/. diff --git a/scripts/cleanProject.sh b/scripts/cleanProject.sh index 49e2db44..0a354b66 100755 --- a/scripts/cleanProject.sh +++ b/scripts/cleanProject.sh @@ -11,15 +11,16 @@ git submodule foreach --recursive git clean -xfd rm -r $BASE_DIR/ics-openvpn rm -r $BASE_DIR/build rm -r $BASE_DIR/app/build -rm -r $BASE_DIR/bitmaskcore/lib/* -rm -r $BASE_DIR/bitmaskcore/golang/ +rm -r $BASE_DIR/bitmask-core-android/lib/* +rm -r $BASE_DIR/bitmask-core-android/golang/ rm -r $BASE_DIR/currentReleases -rm -r $BASE_DIR/tor-android/build -rm -r $BASE_DIR/tor-android/tor-android-binary/build -rm -r $BASE_DIR/tor-android/external/bin -rm -r $BASE_DIR/tor-android/external/include/ -rm -r $BASE_DIR/tor-android/external/*.build-stamp -rm -r $BASE_DIR/tor-android/external/lib +#rm -r $BASE_DIR/tor-android/build +#rm -r $BASE_DIR/tor-android/tor-android-binary/build +#rm -r $BASE_DIR/tor-android/external/bin +#rm -r $BASE_DIR/tor-android/external/include/ +#rm -r $BASE_DIR/tor-android/external/*.build-stamp +#rm -r $BASE_DIR/tor-android/external/lib +rm -r $BASE_DIR/tor-android git reset --hard git submodule foreach --recursive git reset --hard HEAD git submodule sync --recursive diff --git a/scripts/prepareForScreenshots.sh b/scripts/prepareForScreenshots.sh index 0b38cfae..eba6f6a1 100755 --- a/scripts/prepareForScreenshots.sh +++ b/scripts/prepareForScreenshots.sh @@ -18,7 +18,7 @@ SCRIPT_DIR=$(dirname "$0") BASE_DIR="$SCRIPT_DIR/.." -rm -r $BASE_DIR/bitmaskcore/lib/* +rm -r $BASE_DIR/bitmask-core-android/lib/* git checkout -- \* git checkout -- \.\* diff --git a/scripts/prepareForTests.sh b/scripts/prepareForTests.sh index d10a04b7..0a5ce709 100755 --- a/scripts/prepareForTests.sh +++ b/scripts/prepareForTests.sh @@ -20,7 +20,7 @@ BASE_DIR="$SCRIPT_DIR/.." git checkout -- \* git checkout -- \.\* -rm -r $BASE_DIR/bitmaskcore/lib/* +rm -r $BASE_DIR/bitmask-core-android/lib/* git submodule foreach --recursive git reset --hard HEAD git submodule sync --recursive git submodule update --init --recursive |