mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android: fix location of the build apks

Browse source 
With all upgrading, the build apks now show up in a slightly different
location. Correct this in the scripting. Notice that this is debug
building only. Release building is outside the repo.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2019-07-17 09:03:48 +02:00 committed by Dirk Hohndel
parent 7c722ea222
commit 29f4d35bc4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
INSTALL
View file

@ -346,4 +346,4 @@ This will download and install the required NDK, SDK and Qt required to build th
After that, you can run: ./subsurface/packaging/android/build.sh everytime you want to build a new version. After that, you can run: ./subsurface/packaging/android/build.sh everytime you want to build a new version.
This will generate an apk file in ./subsurface-mobile-build-arm/build/outputs/apk/ This will generate an apk file in ./subsurface-mobile-build-arm/build/outputs/apk/debug

4
packaging/android/android-build-wrapper.sh
View file

@ -149,7 +149,7 @@ echo "${BUILDNR}" > ./buildnr.dat
echo "Building Subsurface-mobile for Android, build nr ${BUILDNR}" echo "Building Subsurface-mobile for Android, build nr ${BUILDNR}"
rm -f ./subsurface-mobile-build-arm/build/outputs/apk/*.apk rm -f ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk
rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml rm -df ./subsurface-mobile-build-arm/AndroidManifest.xml
if [ "$USE_X" ] ; then if [ "$USE_X" ] ; then
@ -160,5 +160,5 @@ else
bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@" bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 "$@"
fi fi
ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk ls -l ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk

4
scripts/android/after_success.sh
View file

@ -8,8 +8,8 @@ fi
source ${TRAVIS_BUILD_DIR}/scripts/release-message.sh source ${TRAVIS_BUILD_DIR}/scripts/release-message.sh
echo "Submitting the folloing apk for continuous build release:" echo "Submitting the folloing apk for continuous build release:"
ls -lh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/*.apk ls -lh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug/*.apk
# get and run the upload script # get and run the upload script
wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh
bash ./upload.sh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/*.apk bash ./upload.sh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug/*.apk

2
scripts/android/travisbuild.sh
View file

@ -8,4 +8,4 @@ set -e
# (but of course having the right things in place will save a ton of time) # (but of course having the right things in place will save a ton of time)
docker exec -e TRAVIS="$TRAVIS" -t android-builder subsurface/packaging/android/android-build-wrapper.sh docker exec -e TRAVIS="$TRAVIS" -t android-builder subsurface/packaging/android/android-build-wrapper.sh
ls -l ../subsurface-mobile-build-docker-arm*/build/outputs/apk/ ls -l ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug