mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 18:23:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Android build: fix android-build-wrapper.sh

Browse source 
I clearly had forgotten to update the Android specific scripts when
adding the libdivecomputer submodule.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-12-06 20:47:20 -08:00
parent 9434c36b7f
commit 7388a8120a
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -94,20 +94,19 @@ if [ ! -d $ANDROID_SDK ] ; then
popd
fi
if [ ! -d libdivecomputer ] ; then
git clone -b Subsurface-branch https://github.com/Subsurface-divelog/libdc.git libdivecomputer
pushd libdivecomputer
if [ ! -d subsurface/libdivecomputer/src ] ; then
pushd subsurface
git submodule init
git submodule update --recursive
popd
fi
if [ ! -f subsurface/libdivecomputer/configure ] ; then
pushd subsurface/libdivecomputer
autoreconf --install
autoreconf --install
popd
fi
pushd libdivecomputer
git pull --rebase
if ! git checkout Subsurface-branch ; then
echo "can't check out the Subsurface-branch branch of libdivecomputer -- giving up"
exit 1
fi
popd
# and now we need a monotonic build number...
if [ ! -f ./buildnr.dat ] ; then